- SCM long_text = get_property ("instrument");
- SCM short_text = get_property ("instr");
-
- if (!(Text_interface::is_markup (long_text)
- || Text_interface::is_markup (short_text)))
- {
- long_text = get_property ("vocalName");
- short_text = get_property ("vocNam");
- }
-
- if (Text_interface::is_markup (long_text)
- || Text_interface::is_markup (short_text))
- {
- text_spanner_ = make_spanner ("InstrumentName", SCM_EOL);
-
- Grob *col = unsmob_grob (get_property ("currentCommandColumn"));
- text_spanner_->set_bound (LEFT, col);
- text_spanner_->set_property ("text", short_text);
- text_spanner_->set_property ("long-text", long_text);
- }
+ long_text = get_property ("vocalName");
+ short_text = get_property ("shortVocalName");
+ }
+
+ if ((Text_interface::is_markup (long_text)
+ || Text_interface::is_markup (short_text))
+ && (!text_spanner_
+ || short_text_ != short_text
+ || long_text_ != long_text))
+ {
+ if (text_spanner_)
+ stop_spanner ();
+
+ short_text_ = short_text;
+ long_text_ = long_text;
+
+ start_spanner ();