Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

Conflicts:

	lily/text-spanner-engraver.cc

diff --cc lily/align-interface.cc
Simple merge

diff --cc lily/bar-number-engraver.cc
Simple merge

diff --cc lily/beam.cc
Simple merge

diff --cc lily/grob.cc
Simple merge

diff --cc lily/paper-score.cc
Simple merge

diff --cc lily/prob-scheme.cc
Simple merge

diff --cc lily/slur.cc
Simple merge

diff --cc lily/stem.cc
Simple merge

diff --cc lily/text-spanner-engraver.cc
index 0b9f3e4a67db4463eb7cf372cd525f91d0871839,0bdc95efc03c183daf390641d7763d562b460e2e..f7b2576d85043c734d0dc9e55add6526ff762ddc
--- 1/lily/text-spanner-engraver.cc
--- 2/lily/text-spanner-engraver.cc
+++ b/lily/text-spanner-engraver.cc
@@@ -121,8 -136,15 +121,13 @@@ Text_spanner_engraver::finalize (
      }
  }
  
 -ADD_ACKNOWLEDGER (Text_spanner_engraver, note_column);
 -
  ADD_TRANSLATOR (Text_spanner_engraver,
-               /* doc */ "Create text spanner from an event.",
-               /* create */ "TextSpanner",
-               /* read */ "",
-               /* write */ "");
+               /* doc */
+               "Create text spanner from an event.",
+               /* create */
+               "TextSpanner ",
+               /* read */
+               "",
+               /* write */
+               ""
+               );

diff --cc lily/trill-spanner-engraver.cc
index 8e56784812c6369e692011c0d69ae33c20a6272f,0100e66b52bc6f56082796ebd9f88d942db531ae..d2ef7e1eb8045c836316aa3c838ed8ebe3667374
--- 1/lily/trill-spanner-engraver.cc
--- 2/lily/trill-spanner-engraver.cc
+++ b/lily/trill-spanner-engraver.cc
@@@ -126,8 -141,10 +126,9 @@@ Trill_spanner_engraver::finalize (
      }
  }
  
 -ADD_ACKNOWLEDGER (Trill_spanner_engraver, note_column);
  ADD_TRANSLATOR (Trill_spanner_engraver,
                /* doc */ "Create trill spanner from an event.",
-               /* create */ "TrillSpanner",
+               /* create */
+               "TrillSpanner ",
                /* read */ "",
                /* write */ "");

diff --cc ly/engraver-init.ly
Simple merge

diff --cc scm/define-grob-properties.scm
Simple merge

diff --cc scm/define-grobs.scm
Simple merge