Fix 1259/1433: linebreaks with \breakDynamicSpan or spanners with style=#'none

[lilypond.git] / lily / tab-note-heads-engraver.cc

diff --git a/lily/tab-note-heads-engraver.cc b/lily/tab-note-heads-engraver.cc
index 958c85d3e7d5b55bdecd2c33d5a19c1483c40c23..4e3f393a2df30766b0fc7cef612f15e1956703b8 100644 (file)
--- a/lily/tab-note-heads-engraver.cc
+++ b/lily/tab-note-heads-engraver.cc
@@ -116,18 +116,21 @@ Tab_note_heads_engraver::process_music ()
       {
        note_entry = scm_list_ref (string_fret_finger, scm_from_int (i));
        string_number = scm_car (note_entry);
-       fret = scm_cadr (note_entry);
-       fret_label = scm_call_3 (fret_procedure,
-                                context ()->self_scm (),
-                                string_number,
-                                fret);
-       index = length_changed ? 0 : i;
-       Item *note = make_item ("TabNoteHead", note_events_[index]->self_scm ());
-       note->set_property ("text", fret_label);
-       staff_position = scm_call_2 (staff_line_procedure,
-                                    context ()->self_scm (),
-                                    string_number);
-       note->set_property ("staff-position", staff_position);
+        if (string_number != SCM_BOOL_F)
+          {
+           fret = scm_cadr (note_entry);
+           fret_label = scm_call_3 (fret_procedure,
+                                    context ()->self_scm (),
+                                    string_number,
+                                    fret);
+           index = length_changed ? 0 : i;
+           Item *note = make_item ("TabNoteHead", note_events_[index]->self_scm ());
+           note->set_property ("text", fret_label);
+           staff_position = scm_call_2 (staff_line_procedure,
+                                        context ()->self_scm (),
+                                        string_number);
+           note->set_property ("staff-position", staff_position);
+          }
       }
 }