]> git.donarmstrong.com Git - lilypond.git/blobdiff - lily/tab-note-heads-engraver.cc
Merge branch 'master' into lilypond/translation
[lilypond.git] / lily / tab-note-heads-engraver.cc
index 4fb33f7199b8ff4698d7d501b060c03baf0802f9..e9c99d12a8860f8d0c4821b5f266a9964ec0460f 100644 (file)
@@ -1,7 +1,20 @@
 /*
-  tab-note-heads-engraver.cc -- part of GNU LilyPond
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c) 2002--2006 Han-Wen Nienhuys, Jean-Baptiste Lamy <jiba@tuxfamily.org>,
+  Copyright (C) 2002--2010 Han-Wen Nienhuys, Jean-Baptiste Lamy <jiba@tuxfamily.org>,
+
+  LilyPond is free software: you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation, either version 3 of the License, or
+  (at your option) any later version.
+
+  LilyPond is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more details.
+
+  You should have received a copy of the GNU General Public License
+  along with LilyPond.  If not, see <http://www.gnu.org/licenses/>.
 */
 
 #include <cctype>
@@ -64,17 +77,21 @@ void
 Tab_note_heads_engraver::process_music ()
 {
   vsize j = 0;
+
+  vector<Stream_event *> string_events;
+
   for (vsize i = 0; i < note_events_.size (); i++)
     {
-      SCM string_tunings = get_property ("stringTunings");
-      int number_of_strings = scm_ilength (string_tunings);
-      bool high_string_one = to_boolean (get_property ("highStringOne"));
 
       Stream_event *event = note_events_[i];
-      Item *note = make_item ("TabNoteHead", event->self_scm ());
 
       Stream_event *tabstring_event = 0;
 
+      /*
+         For notes inside a chord construct, string indications are
+         stored as articulations on the note, so we check through
+         the notes
+      */
       for (SCM s = event->get_property ("articulations");
           !tabstring_event && scm_is_pair (s); s = scm_cdr (s))
        {
@@ -84,58 +101,63 @@ Tab_note_heads_engraver::process_music ()
            tabstring_event = art;
        }
 
+      /*
+         For string indications listed outside a chord construct,
+         a string_number_event is generated, so if there was no string
+         in the articulations, we check for string events outside
+         the chord construct
+      */
       if (!tabstring_event && j < tabstring_events_.size ())
        {
          tabstring_event = tabstring_events_[j];
          if (j + 1 < tabstring_events_.size ())
            j++;
        }
-
-      int tab_string;
-      bool string_found;
       if (tabstring_event)
-       {
-         tab_string = scm_to_int (tabstring_event->get_property ("string-number"));
-         string_found = true;
-       }
-      else
-       {
-         tab_string = high_string_one ? 1 : number_of_strings;
-         string_found = false;
-       }
-
-      Duration dur = *unsmob_duration (event->get_property ("duration"));
-
-      SCM scm_pitch = event->get_property ("pitch");
-      SCM proc = get_property ("tablatureFormat");
-      SCM min_fret_scm = get_property ("minimumFret");
-      int min_fret = scm_is_number (min_fret_scm) ? scm_to_int (min_fret_scm) : 0;
-
-      while (!string_found)
-       {
-         int fret = unsmob_pitch (scm_pitch)->rounded_semitone_pitch ()
-           - scm_to_int (scm_list_ref (string_tunings, scm_from_int (tab_string - 1)));
-         if (fret < min_fret)
-           tab_string += high_string_one ? 1 : -1;
-         else
-           string_found = true;
-       }
-
-      SCM text = scm_call_3 (proc, scm_from_int (tab_string),
-                            context ()->self_scm (),
-                            event->self_scm ());
-      note->set_property ("text", text);
-
-
-      int pos = 2 * tab_string - number_of_strings - 1; // No tab-note between the string !!!
-      if (to_boolean (get_property ("stringOneTopmost")))
-       pos = -pos;
-
-      note->set_property ("staff-position", scm_from_int (pos));
-
-      
-      notes_.push_back (note);
+        string_events.push_back (tabstring_event);
     }
+
+  SCM tab_notes = ly_cxx_vector_to_list (note_events_);
+  SCM tab_strings = SCM_EOL;
+  if (string_events.size ())
+    tab_strings = ly_cxx_vector_to_list (string_events);
+  SCM proc = get_property ("noteToFretFunction");
+  SCM string_fret_finger = SCM_EOL;
+  if (ly_is_procedure (proc))
+    string_fret_finger = scm_call_3 (proc,
+                                     context ()->self_scm (),
+                                     tab_notes,
+                                     tab_strings);
+  SCM note_entry = SCM_EOL;
+  SCM string_number = SCM_EOL;
+  SCM fret = SCM_EOL;
+  SCM fret_label = SCM_EOL;
+  SCM fret_procedure = get_property ("tablatureFormat");
+  SCM staff_line_procedure = get_property ("tabStaffLineLayoutFunction");
+  SCM staff_position = SCM_EOL;
+  vsize fret_count = (vsize) scm_ilength (string_fret_finger);
+  bool length_changed = (note_events_.size () != fret_count);
+  vsize index;
+
+  if (string_fret_finger != SCM_EOL)
+    for (vsize i=0; i < fret_count; i++)
+      {
+         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);
+         notes_.push_back (note);
+      }
 }
 
 void
@@ -147,18 +169,24 @@ Tab_note_heads_engraver::stop_translation_timestep ()
 }
 
 ADD_TRANSLATOR (Tab_note_heads_engraver,
-               /* doc */ "Generate one or more tablature noteheads from event of type NoteEvent.",
+               /* doc */
+               "Generate one or more tablature noteheads from event of type"
+               " @code{NoteEvent}.",
+
                /* create */
-               "TabNoteHead "
-               ,
+               "TabNoteHead ",
 
                /* read */
+               "fretLabels "
+               "highStringOne "
                "middleCPosition "
-               "stringTunings "
                "minimumFret "
-               "tablatureFormat "
-               "highStringOne "
-               "stringOneTopmost ",
+                "noteToFretFunction "
+               "stringOneTopmost "
+               "stringTunings "
+                "tablatureFormat "
+                "tabStaffLineLayoutFunction ",
 
-               /* write */ "");
+               /* write */ ""
+               );