From a7197eed4ddb1ae3199721bc4940a8b9de5dbc66 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 24 Feb 2004 01:00:57 +0000 Subject: [PATCH] (Customized accidental rules): typo. --- ChangeLog | 5 +++++ Documentation/user/refman.itely | 12 ++++++++---- lily/lexer.ll | 6 +++--- lily/parser.yy | 3 ++- lily/recording-group-engraver.cc | 2 +- scm/part-combiner.scm | 7 +------ 6 files changed, 20 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4308762d57..2b6b744741 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-02-24 Han-Wen Nienhuys + + * Documentation/user/refman.itely (Customized accidental rules): + typo. + 2004-02-23 Heikki Junes * Documentation/user/music-glossary.tely: remove the missing norwegian diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index 6b07d6aa18..8224465a7d 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -1685,11 +1685,11 @@ voices in the same staff share accidentals, but staves do not. same-octave. @end table -@item lazyness +@item laziness Over how many barlines the accidental lasts. - If @var{lazyness} is @code{-1} then the accidental is forget - immediately, and if @var{lazyness} is @code{#t} then the accidental + If @var{laziness} is @code{-1} then the accidental is forget + immediately, and if @var{laziness} is @code{#t} then the accidental lasts forever. @end table @@ -4495,7 +4495,11 @@ measure. @code{\partcombine} can not be inside @code{\times}. - +Internally, the @code{\partcombine} interprets both arguments as +@code{Voice}s named @code{one} and @code{two}, and then decides when +the parts can be combined. Consequently, if the arguments switch to +differently named @internalsref{Voice} contexts, then the events in +those will be ignored. @node Hiding staves @subsection Hiding staves diff --git a/lily/lexer.ll b/lily/lexer.ll index 376bd81fd9..70e62160f9 100644 --- a/lily/lexer.ll +++ b/lily/lexer.ll @@ -645,9 +645,9 @@ My_lily_lexer::pop_state () } int -My_lily_lexer::identifier_type(SCM sid) +My_lily_lexer::identifier_type (SCM sid) { - int k = try_special_identifiers(&yylval.scm , sid); + int k = try_special_identifiers (&yylval.scm , sid); return k >= 0 ? k : SCM_IDENTIFIER; } @@ -777,7 +777,7 @@ is_valid_version (String s) /* - substittute _ adn \, + substitute _ and \, */ String lyric_fudge (String s) diff --git a/lily/parser.yy b/lily/parser.yy index 1ff6ab489e..666963b1f7 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -2417,7 +2417,8 @@ My_lily_lexer::try_special_identifiers (SCM * destination, SCM sid) *destination =sc->self_scm (); return SCORE_IDENTIFIER; } else if (Music * mus =unsmob_music (sid)) { - *destination = unsmob_music (sid)->clone ()->self_scm(); + mus = mus->clone (); + *destination = mus->self_scm(); unsmob_music (*destination)-> set_property ("origin", make_input (last_input_)); return dynamic_cast (mus) diff --git a/lily/recording-group-engraver.cc b/lily/recording-group-engraver.cc index 25f5392172..c314bb736f 100644 --- a/lily/recording-group-engraver.cc +++ b/lily/recording-group-engraver.cc @@ -44,7 +44,7 @@ Recording_group_engraver::start_translation_timestep () /* We have to do this both in initialize() and start_translation_timestep(), since start_translation_timestep() - isn't called on the first time-step.g + isn't called on the first time-step. */ if (!gh_pair_p (gh_car (accumulator_))) scm_set_car_x (accumulator_, gh_cons (now_mom ().smobbed_copy (), SCM_EOL)); diff --git a/scm/part-combiner.scm b/scm/part-combiner.scm index bad155986b..fcca7a56b8 100644 --- a/scm/part-combiner.scm +++ b/scm/part-combiner.scm @@ -250,14 +250,9 @@ Voice-state objects ((m (make-music-by-name 'PartCombineMusic)) (m1 (context-spec-music (car music-list) 'Voice "one")) (m2 (context-spec-music (cadr music-list) 'Voice "two")) - (props '((denies Thread) - (consists Rest_engraver) - (consists Note_heads_engraver) - ))) + ) (ly:music-set-property! m 'elements (list m1 m2)) - (ly:music-set-property! m1 'property-operations props) - (ly:music-set-property! m2 'property-operations props) (ly:run-translator m2 part-combine-listener) (ly:run-translator m1 part-combine-listener) (ly:music-set-property! m 'split-list -- 2.39.2