Fix 626.

Let ottavation accept markup text.

Also allow markup text for part-combine texts.

diff --git a/lily/ottava-engraver.cc b/lily/ottava-engraver.cc
index f1042877963d6b3eba29f0973cdb9f2b7f90b843..44fbc3b11f3f11bf809e0790cf6230ed1bf21633 100644 (file)
--- a/lily/ottava-engraver.cc
+++ b/lily/ottava-engraver.cc
@@ -11,6 +11,7 @@
 #include "side-position-interface.hh"
 #include "engraver.hh"
 #include "spanner.hh"
 #include "side-position-interface.hh"
 #include "engraver.hh"
 #include "spanner.hh"

+#include "text-interface.hh"

 #include "item.hh"
 
 class Ottava_spanner_engraver : public Engraver
 #include "item.hh"
 
 class Ottava_spanner_engraver : public Engraver


@@ -55,7 +56,7 @@ Ottava_spanner_engraver::process_music ()
     {
       finished_ = span_;
       span_ = 0;
     {
       finished_ = span_;
       span_ = 0;

-      if (scm_is_string (ott))
+      if (Text_interface::is_markup (ott))

        {
          span_ = make_spanner ("OttavaBracket", SCM_EOL);
          span_->set_property ("text", ott);
        {
          span_ = make_spanner ("OttavaBracket", SCM_EOL);
          span_->set_property ("text", ott);

diff --git a/scm/define-context-properties.scm b/scm/define-context-properties.scm
index 357a3e02f4239aca187a74f55f2a3bdde71576f7..42c8e1652794f90bb629c4c46310136f93b1f92c 100644 (file)
--- a/scm/define-context-properties.scm
+++ b/scm/define-context-properties.scm
@@ -33,7 +33,7 @@
 
      ;; TODO FIXME
    
 
      ;; 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
      (alignBelowContext ,string? "Where to insert newly created context in
 vertiical alignment.")
      (alignAboveContext ,string? "Where to insert newly created context in


@@ -329,7 +329,7 @@ repeated section for a page turn to be allowed within that section.")
 Parameters: A list of note events and a list of tabstring events.")
 
 
 Parameters: A list of note events and a list of tabstring events.")
 
 

-     (ottavation ,string? "If set, the text for an ottava spanner.
+     (ottavation ,markup? "If set, the text for an ottava spanner.

 Changing this creates a new text spanner.")
      (output ,ly:music-output? "The output produced by a score-level
 translator during music interpretation.")
 Changing this creates a new text spanner.")
      (output ,ly:music-output? "The output produced by a score-level
 translator during music interpretation.")


@@ -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.")
      (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.")
 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}.")
 part-combining.")
      (squashedPosition ,integer? "Vertical position of squashing for
 @rinternals{Pitch_squash_engraver}.")