lilypond-1.3.85

diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc
index bfa597527b0dd5464fdf5cd82f5bc5bc1ad27457..b1697e199eec9eaf4d8c74017ac3b81473bd3c11 100644 (file)
--- a/lily/music-iterator.cc
+++ b/lily/music-iterator.cc
@@ -134,19 +134,19 @@ Music_iterator::static_get_iterator_p (Music  *m)
     p = new Request_chord_iterator;
   else if (dynamic_cast<Lyric_combine_music *> (m))
     p = new Lyric_combine_music_iterator;
-  else if (dynamic_cast<Simultaneous_music   *> (m)) 
+  else if (dynamic_cast<Simultaneous_music *> (m)) 
     p =  new Simultaneous_music_iterator;
-  else if (dynamic_cast<Sequential_music   *> (m)) 
+  else if (dynamic_cast<Sequential_music *> (m)) 
     p =  new Sequential_music_iterator;
-  else if (dynamic_cast<Translation_property   *> (m))
+  else if (dynamic_cast<Translation_property *> (m))
     p = new Property_iterator;
-  else if (dynamic_cast<Change_translator   *> (m))
+  else if (dynamic_cast<Change_translator *> (m))
     p = new Change_iterator;
   else if (dynamic_cast<Push_translation_property*>(m))
     p = new Push_property_iterator;
   else if (dynamic_cast<Pop_translation_property*>(m))
     p = new Pop_property_iterator;
-  else if (dynamic_cast<Time_scaled_music   *> (m))
+  else if (dynamic_cast<Time_scaled_music *> (m))
     p = new Time_scaled_music_iterator;
   else if (dynamic_cast<Grace_music *> (m))
     p = new Grace_iterator;

diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
index 6fe78ea1ccd69bb0ee649461818d647cf1ea9ba3..a3dc6043aca070ade02c649293d54baa3a82fa0d 100644 (file)
--- a/lily/my-lily-lexer.cc
+++ b/lily/my-lily-lexer.cc
@@ -60,6 +60,8 @@ static Keyword_ent the_key_tab[]={
   {"outputproperty", OUTPUTPROPERTY},
   {"pushproperty", PUSHPROPERTY},
   {"popproperty", POPPROPERTY},
+  {"push", PUSH},
+  {"pop", POP},
   {"partial", PARTIAL},
   {"paper", PAPER},
   {"penalty", PENALTY},

diff --git a/lilypond-mode.el b/lilypond-mode.el
index b035151c548979ee6cbd0a5f5e335ae2d16db7aa..237f0a347db869defadb1e73ae5ccc8cbecfe07f 100644 (file)
--- a/lilypond-mode.el
+++ b/lilypond-mode.el
@@ -44,7 +44,7 @@
                     "duration" "font" "grace" "header" "in" "lyrics"
                     "key" "keysignature" "mark" "musicalpitch"
                     "time" "times" "midi" "mm" "name" "notenames"
-                    "notes" "partial" "paper" "penalty" "property" "pt"
+                    "notes" "partial" "paper" "penalty" "push" "pop" "property" "pt"
                     "relative" "remove" "repeat" "repetitions" "addlyrics"
                     "scm" "scmfile" "score" "script"
                     "shape" "skip" "textscript" "tempo" "translator" "transpose"

diff --git a/stepmake/stepmake/help2man-rules.make b/stepmake/stepmake/help2man-rules.make
index 493d7acff5f7620d3e2e0ad5109e10f471f98c16..8f90dc312a689e79b93ab0ef28fb402c0f344d14 100644 (file)
--- a/stepmake/stepmake/help2man-rules.make
+++ b/stepmake/stepmake/help2man-rules.make
@@ -12,7 +12,8 @@ $(outdir)/%.1: out/%.1
 endif
 
 $(outdir)/%.1: $(outdir)/%
-       $(PERL) $(depth)/$(builddir)/buildscripts/$(outbase)/help2man $< > $@ || \
+       echo "generating man page from --help"
+       @$(PERL) $(depth)/$(builddir)/buildscripts/$(outbase)/help2man $< > $@ || \
        (echo ""; echo "Apparently the man pages failed to build. This is";\
        echo "no problem, since they don't contain any information anyway.";\
        echo "Please run make again, and be prepared for NO manual pages.")