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

* 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond:
  Fix 626.

diff --git a/lily/ottava-engraver.cc b/lily/ottava-engraver.cc
index 196eb25174c26e2a201b1da6d83c224f38619e99..60c3fb178a987cb0a373a15f9e00ea48331ca3f9 100644 (file)
--- a/lily/ottava-engraver.cc
+++ b/lily/ottava-engraver.cc
@@ -12,6 +12,7 @@
 #include "side-position-interface.hh"
 #include "engraver.hh"
 #include "spanner.hh"
+#include "text-interface.hh"
 #include "item.hh"
 
 class Ottava_spanner_engraver : public Engraver

diff --git a/scm/define-context-properties.scm b/scm/define-context-properties.scm
index f763a18846a73fd3fe094541bc423c8dcee029a1..42c8e1652794f90bb629c4c46310136f93b1f92c 100644 (file)
--- a/scm/define-context-properties.scm
+++ b/scm/define-context-properties.scm
@@ -33,7 +33,7 @@
 
      ;; TODO FIXME
    
-     (aDueText ,string? "Text to print at a unisono passage.")
+     (aDueText ,markup? "Text to print at a unisono passage.")
      (alignBelowContext ,string? "Where to insert newly created context in
 vertiical alignment.")
      (alignAboveContext ,string? "Where to insert newly created context in
@@ -391,9 +391,9 @@ voices is preserved.
      (skipTypesetting ,boolean? "If true, no typesetting is done,
 speeding up the interpretation phase.  Useful for debugging large
 scores.")
-     (soloIIText ,string? "The text for the start of a solo for
+     (soloIIText ,markup? "The text for the start of a solo for
 voice @q{two} when part-combining.")
-     (soloText ,string? "The text for the start of a solo when
+     (soloText ,markup? "The text for the start of a solo when
 part-combining.")
      (squashedPosition ,integer? "Vertical position of squashing for
 @rinternals{Pitch_squash_engraver}.")