*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 511a322282cdfbc2f08f1175f7bd17930f1e0ce1..f41df7b0d87eb5763136c895f4e8486a88615bfb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -85,7 +85,7 @@
        ($(outdir)/Fontmap.lily): idem.
 
        * buildscripts/gen-emmentaler-scripts.py (i): load fetaXX encoding
-       for PFAEmmentaler-XXX.pfa. This fixes ghostscript ps2pdf problems.
+       for PFAEmmentaler-XXX.pfa. 
 
        * Documentation/user/music-glossary.tely (accidental): NL
        translation of accidental.

diff --git a/Documentation/user/global.itely b/Documentation/user/global.itely
index f3b855e9601c0e63ab265ea5a5aadb5052942a79..3cfaf886613608ea9a11a5de5ac50a69a04d5e56 100644 (file)
--- a/Documentation/user/global.itely
+++ b/Documentation/user/global.itely
@@ -801,11 +801,11 @@ may use any @ref{Text markup} commands in the header.
 \book {
   \header {
     dedication = "dedicated to me"
-    title = \markup \center-align < "Title first line" "Title second line, longer" >
+    title = \markup \center-align { "Title first line" "Title second line, longer" }
     subtitle = "the subtitle,"
     subsubtitle = #(string-append "subsubtitle LilyPond version " (lilypond-version))
     poet = "Poet"
-    composer =  \markup \center-align < "composer" \small "(1847-1973)" >
+    composer =  \markup \center-align { "composer" \small "(1847-1973)" }
     texttranslator = "Text Translator"
     meter = \markup { \teeny "m" \tiny "e" \normalsize "t" \large "e" \huge "r" }
     arranger = "Arranger"

diff --git a/VERSION b/VERSION
index 6e46ae6c12ca252dc409164bcfbdb4c2226171e3..bcd4ae6864e2348f986c7e053a07beaf6574b745 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=5
-PATCH_LEVEL=21
+PATCH_LEVEL=22
 MY_PATCH_LEVEL=
 

diff --git a/lily/include/music-iterator.hh b/lily/include/music-iterator.hh
index 7b395e8a2c49c55e9a1d12175a4a5112d7aefee7..89619297dd1d219d3c389f8868f7e88beb3194f9 100644 (file)
--- a/lily/include/music-iterator.hh
+++ b/lily/include/music-iterator.hh
@@ -55,28 +55,14 @@ protected:
 
   DECLARE_SMOBS (Music_iterator, dummy);
   Music_iterator (Music_iterator const &);
-public:
 
+public:
   Moment music_get_length () const;
   Moment music_start_mom () const;
   Music_iterator ();
-
-  /**
-     Do the reporting.  Will try MUSIC_L_ in its own translator first,
-     then its children. Returns the iterator that succeeded
-  */
   Music_iterator *try_music (Music *) const;
-
-  /**
-     The translation unit that we this iterator is reporting  to now.
-  */
   Context *get_outlet () const;
-
   void set_context (Context *);
-
-  /** Get an iterator matching the type of MUS, and use TRANS to find
-      an accompanying translation unit
-  */
   static SCM get_static_get_iterator (Music *mus);
   void init_translator (Music *, Context *);
   void quit ();
@@ -84,22 +70,11 @@ public:
   virtual void derived_substitute (Context *, Context *);
   virtual Moment pending_moment () const;
   virtual bool ok () const;
-
   virtual bool run_always () const;
   virtual void process (Moment until);
   virtual void derived_mark () const;
   virtual void construct_children ();
-
-  /**
-     Construct sub-iterators, and set the translator to
-     report to.
-  */
-
   DECLARE_SCHEME_CALLBACK (constructor, ());
-
-  /**
-     Get an iterator for MUS, inheriting the translation unit from THIS.
-  */
   SCM get_iterator (Music *) const;
 
   virtual Music_iterator *try_music_in_children (Music *) const;
@@ -108,6 +83,7 @@ public:
 protected:
   virtual void do_quit ();
   void descend_to_child (Context *);
+
 private:
   Interpretation_context_handle handle_;
   Music *music_;