From 2c87fdce9f115ada77e7147d59043784b2f01fa8 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Thu, 21 Aug 2003 17:35:46 +0000 Subject: [PATCH] * lily/parser.yy (pre_events): remove prefix articulations. * Documentation/user/refman.itely (Text markup): add comment about markup in header. --- Documentation/user/refman.itely | 7 ++++--- lily/parser.yy | 17 ++++++++++++++++- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index 8f8851b01d..4f798307e9 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -1947,6 +1947,10 @@ articulation. They are demonstrated here: @lilypondfile[notexidoc]{script-abbreviations.ly} +The meanings of these shorthands can be changed: see +@file{ly/script-init.ly} for examples. + + The script is automatically placed, but if you need to force directions, you can use @code{_} to force them down, or @code{^} to put them up: @@ -1954,9 +1958,6 @@ put them up: c''4^^ c''4_^ @end lilypond - - - Other symbols can be added using the syntax @var{note}@code{-\}@var{name}, e.g. @code{c4-\fermata}. Again, they can be forced up or down using @code{^} and @code{_}: diff --git a/lily/parser.yy b/lily/parser.yy index 4fa67c105c..249bdbbe6e 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -1245,7 +1245,9 @@ nevertheless, this is not very clean, and we should find a different solution. */ -pre_events: +pre_events: { + THIS->push_spot (); + } ; event_chord: @@ -1501,6 +1503,17 @@ event_that_take_dir: | close_event | open_event | '[' { + + +/* + +TODO: should take all these defs out of the parser, adn make use +configurable, i.e. + + +(set-articulation '~ "trill") + +*/ Music * m = MY_MAKE_MUSIC ("NewBeamEvent"); m->set_spot (THIS->here_input()); m->set_mus_property ("span-direction" , gh_int2scm (START)); @@ -2119,6 +2132,8 @@ step_number: */ number_expression: number_expression '+' number_term { + + THIS-> $$ = scm_sum ($1, $3); } | number_expression '-' number_term { -- 2.39.5