(Customized accidental rules):

typo.

diff --git a/ChangeLog b/ChangeLog
index 4308762d5701bcd0f796eaa7e63981a6d50507d7..2b6b744741694f36a0d19a915f9c7d5dca1b2aca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-02-24  Han-Wen Nienhuys   <hanwen@xs4all.nl>
+
+       * Documentation/user/refman.itely (Customized accidental rules):
+       typo.
+
 2004-02-23  Heikki Junes <hjunes@cc.hut.fi>
 
        * Documentation/user/music-glossary.tely: remove the missing norwegian

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index 6b07d6aa185fca630a6c512139636842aafb45d9..8224465a7d9451b65957273f6bf3274feb5227c0 100644 (file)
--- 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 376bd81fd979caee854cc2564ecf35bd87768f95..70e62160f91002ba4777cce7f530d6c63210ee5d 100644 (file)
--- 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 1ff6ab489e581f824eb3648dcd82ad7922a95df0..666963b1f75bb967fd9edf03d424f7988622fc8f 100644 (file)
--- 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<Event*> (mus)

diff --git a/lily/recording-group-engraver.cc b/lily/recording-group-engraver.cc
index 25f5392172f314b0050501312b181f8538592303..c314bb736faa2d9d8ede051897c67c203a199eee 100644 (file)
--- 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 bad155986ba39f6862886c3cca051852c3ed0d60..fcca7a56b85e36b06ee4de21ea9a598f54f7ab41 100644 (file)
--- 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