From: Han-Wen Nienhuys Date: Wed, 16 Jul 2003 13:41:10 +0000 (+0000) Subject: (Grace notes): note on explicit X-Git-Tag: release/1.7.26~35 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=fb34b64527f10791aabb71a2695cf07b04e43e3b;p=lilypond.git (Grace notes): note on explicit contexts --- diff --git a/ChangeLog b/ChangeLog index a9654401f3..e03d4d4743 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2003-07-16 Han-Wen Nienhuys + + * Documentation/user/refman.itely (Grace notes): note on explicit + contexts + 2003-07-16 Heikki Junes * lilypond-font-lock.el: add a comment about LilyPond specific diff --git a/Documentation/user/appendices.itely b/Documentation/user/appendices.itely index 18099210f2..47d6268056 100644 --- a/Documentation/user/appendices.itely +++ b/Documentation/user/appendices.itely @@ -2,10 +2,9 @@ @appendix Reference manual details @menu -* American Chords:: -* Jazz chords:: -* MIDI instruments:: -* The Feta font:: +* Chord name chart:: +* MIDI instruments:: +* The Feta font:: @end menu diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index ff2cfa3ced..385f171e62 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -1761,7 +1761,7 @@ c'4 \breathe d4 @end lilypond The glyph of the breath mark can be tweaked by overriding the -@code{text} property of the @code{BreathingSign} grob with the name of +@code{text} property of the @code{BreathingSign} layout object with the name of any glyph of @ref{The Feta font}. For example, @lilypond[fragment,verbatim,relative] c'4 @@ -2026,8 +2026,6 @@ commands will not work with direct PostScript output. @node Grace notes @subsection Grace notes - - @cindex @code{\grace} @cindex ornaments @cindex grace notes @@ -2136,6 +2134,10 @@ second bars in this example: Grace notes cannot be used in the smallest size (@file{paper11.ly}). +A score that starts with an @code{\grace} section needs an explicit +@code{\context Voice} declaration, otherwise the main note and grace +note end up on different staffs. + Grace note synchronization can also lead to surprises. Staff notation, such as key signatures, barlines, etc. are also synchronized. Take care when you mix staves with grace notes and staves without. @@ -2391,7 +2393,7 @@ With alternative endings: @refbugs - If you do a nested repeat like +If you do a nested repeat like @example \repeat @dots{} @@ -6538,7 +6540,7 @@ vertical spacing of the figures may be set with @code{baseline-skip}. @seealso -@internalsref{BassFigureEvent} music, @internalsref{BassFigure} grob, +@internalsref{BassFigureEvent} music, @internalsref{BassFigure} object, @internalsref{FiguredBass} context @refbugs @@ -6712,7 +6714,7 @@ object, and set a object property in that object. The definition of an object is actually a list of default object properties. For example, the definition of the Stem object (available -in @file{scm/grob-description.scm}), includes the following definitions for +in @file{scm/define-grobs.scm}), includes the following definitions for @internalsref{Stem} @example @@ -6734,11 +6736,11 @@ Changing a variable for only one object is commonly achieved with @code{\once}: @example -\once \property @var{context}.@var{grobname} +\once \property @var{context}.@var{objectname} \override @var{symbol} = @var{value} @end example Here @var{symbol} is a Scheme expression of symbol type, @var{context} -and @var{grobname} is a string and @var{value} is a Scheme expression. +and @var{objectname} is a string and @var{value} is a Scheme expression. This command applies a setting only during one moment in the score. In the following example, only one @internalsref{Stem} object is @@ -6755,16 +6757,16 @@ changed from its original setting: For changing more objects, the same command, without @code{\once} can be used. @example -\property @var{context}.@var{grobname} \override @var{symbol} = @var{value} +\property @var{context}.@var{objectname} \override @var{symbol} = @var{value} @end example This command adds @code{@var{symbol} = @var{value}} to the definition -of @var{grobname} in the context @var{context}, and this definition +of @var{objectname} in the context @var{context}, and this definition stays in place until it is removed. An existing definition may be removed by the following command @c @example -\property @var{context}.@var{grobname} \revert @var{symbol} +\property @var{context}.@var{objectname} \revert @var{symbol} @end example @c All @code{\override} and @code{\revert} commands should be balanced. @@ -6772,7 +6774,7 @@ The @code{\set} shorthand, performs a revert followed by an override, and is often more convenient to use @example -\property @var{context}.@var{grobname} \set @var{symbol} = @var{value} +\property @var{context}.@var{objectname} \set @var{symbol} = @var{value} @end example Some examples: @@ -6924,7 +6926,12 @@ The @code{Fingering} object has a fixed size objects (@internalsref{side-position-interface}) vertically, and its placement is coordinated with other scripts (@internalsref{text-script-interface}). It also has the standard -@internalsref{grob-interface} with all the variables that come with +@internalsref{grob-interface} (grob stands for Graphical object) +@cindex grob +@cindex graphical object +@cindex layout object +@cindex object, layout +with all the variables that come with it. Finally, it denotes a fingering instruction, so it has @internalsref{finger-interface}. @@ -7010,17 +7017,17 @@ syntax is @end example where @var{proc} is a Scheme function, taking four arguments. -When interpreted, the function @var{proc} is called for every grob found +When interpreted, the function @var{proc} is called for every layout object found in the context, with the following arguments: @itemize @bullet -@item the grob itself -@item the context where the grob was created +@item the layout object itself +@item the context where the layout object was created @item the context where @code{\applyoutput} is processed. @end itemize -In addition, the cause of the grob, i.e. the music expression or object -that was responsible for creating the object, is in the object property -@code{cause}. For example, for a note head, this is a +In addition, the cause of the layout object, i.e. the music +expression or object that was responsible for creating it, is in the +object property @code{cause}. For example, for a note head, this is a @internalsref{NoteHead} event, and for a @internalsref{Stem} object, this is a @internalsref{NoteHead} object. diff --git a/THANKS b/THANKS index 29be325d19..0325e919e9 100644 --- a/THANKS +++ b/THANKS @@ -2,20 +2,38 @@ CONTRIBUTORS Graham Percival -Rune Zedeler +Heikki Junes Jeremie Lumbroso Juergen Reuter Kim Shrier -Heikki Junes - +Rune Zedeler +Werner Lemberg BUG HUNTERS +Amelie Zapf +Andrew Schaaf +Atte Andre Jensen +Bob Harrington +Chris Jackson +Chris Sawer +David Bobroff Erik Sandberg +Fernando Pablo Lopez-Lezcano Hans Kieserman Jeremie Lumbroso -Karl-Johan Karlsson +John Potelle +John Williams Karl Berry -Werner Lemberg -Thomas Rijniers +Karl-Johan Karlsson Klaus Zimmermann +Koblinger Egmont +Paul Scott +Pedro Kroger +Richard Shann +Ryan O'Neil +Simon Bailey +Stanislav Brabec +Thomas Rijniers +Werner Lemberg +Yotam Medini diff --git a/python/lilylib.py b/python/lilylib.py index 9e9abca643..48bed604fa 100644 --- a/python/lilylib.py +++ b/python/lilylib.py @@ -16,6 +16,7 @@ import shutil import string import sys import tempfile +import glob ################################################################ # Users of python modules should include this snippet @@ -431,11 +432,14 @@ def make_ps_images (ps_name, resolution = 90): cmd = r'''gs -g%dx%d -sDEVICE=pnggray -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -q -sOutputFile=%s -r%d -dNOPAUSE %s %s -c quit ''' % \ (x, y, output_file, resolution, trans_ps, ps_name) - rmfile = base + '-page*.png' + rms = glob.glob (base + '-page*.png') + map (os.unlink, rms) else: output_file = re.sub (r'\.e?ps', '-page%d.png', ps_name) rmfile = base + '.png' - + if os.path.isfile (rmfile): + os.unlink (rmfile) + cmd = r'''gs -s -sDEVICE=pnggray -dTextAlphaBits=4 -dGraphicsAlphaBits=4 -q -sOutputFile=%s -dNOPAUSE -r%d %s -c quit''' % (output_file, resolution, ps_name) @@ -443,9 +447,6 @@ def make_ps_images (ps_name, resolution = 90): signal = 0xf & status exit_status = status >> 8 - rms = glob.glob (rmfile) - print 'removing ', rms - map (os.unlink, rms) if status: os.unlink (png) diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py index c837dcb397..6ad8eac3df 100644 --- a/scripts/ly2dvi.py +++ b/scripts/ly2dvi.py @@ -916,7 +916,7 @@ if 1: ly.warning (_("Running LaTeX falied. Rerun with --verbose for a trace.")) if page_images_p: - ly.make_ps_images (outbase) + ly.make_ps_images (outbase + '.ps' ) # add DEP to targets? if track_dependencies_p: