X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Ffretboard-engraver.cc;h=98375a3db77471a2d75c331751548d84eb0c3ec4;hb=66cf32a015a733a69d7faf46ad84dd1049a9fb38;hp=d0ad15050f8d1b650df67bcbe47d0ae4592c84eb;hpb=1aff89b4d5507bc850698a041bb0f51dd22cff2b;p=lilypond.git

diff --git a/lily/fretboard-engraver.cc b/lily/fretboard-engraver.cc
index d0ad15050f..98375a3db7 100644
--- a/lily/fretboard-engraver.cc
+++ b/lily/fretboard-engraver.cc
@@ -1,7 +1,20 @@
 /*
-  fretboard-engraver.cc -- part of GNU LilyPond
+  This file is part of LilyPond, the GNU music typesetter.
 
-  (c)  2006  Han-Wen Nienhuys
+  Copyright (C) 2006--2010 Han-Wen Nienhuys
+
+  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>
@@ -23,23 +36,34 @@ using namespace std;
 class Fretboard_engraver : public Engraver
 {
   Item *fret_board_;
-  
+
   vector<Stream_event*> note_events_;
   vector<Stream_event*> tabstring_events_;
 public:
   TRANSLATOR_DECLARATIONS (Fretboard_engraver);
 
 protected:
+  void stop_translation_timestep ();
+  void process_music ();
+  virtual void derived_mark() const;
   DECLARE_TRANSLATOR_LISTENER (note);
   DECLARE_TRANSLATOR_LISTENER (string_number);
-  void process_music ();
 
-  void stop_translation_timestep ();
+private:
+  SCM last_fret_notes_;
 };
 
+
+void
+Fretboard_engraver::derived_mark () const
+{
+  scm_gc_mark (last_fret_notes_);
+}
+
 Fretboard_engraver::Fretboard_engraver ()
 {
   fret_board_ = 0;
+  last_fret_notes_ = SCM_EOL;
 }
 
 IMPLEMENT_TRANSLATOR_LISTENER (Fretboard_engraver, note);
@@ -63,17 +87,20 @@ Fretboard_engraver::process_music ()
     return ;
 
   fret_board_ = make_item ("FretBoard", note_events_[0]->self_scm ());
-
+  SCM fret_notes = ly_cxx_vector_to_list (note_events_);
   SCM proc = get_property ("noteToFretFunction");
   if (ly_is_procedure (proc))
-    {
-      scm_call_4 (proc,
-		  context ()->self_scm (),
-		  fret_board_->self_scm (),
-			       
-		  ly_cxx_vector_to_list (note_events_),
-		  ly_cxx_vector_to_list (tabstring_events_));
-    }
+     scm_call_4 (proc,
+                 context ()->self_scm (),
+                 fret_notes,
+                 ly_cxx_vector_to_list (tabstring_events_),
+                 fret_board_->self_scm ());
+  SCM changes = get_property ("chordChanges");
+  if (to_boolean (changes) && scm_is_pair (last_fret_notes_)
+      && ly_is_equal (last_fret_notes_, fret_notes))
+    fret_board_->set_property ("begin-of-line-visible", SCM_BOOL_T);
+
+  last_fret_notes_ = fret_notes;
 }
 
 void
@@ -85,16 +112,24 @@ Fretboard_engraver::stop_translation_timestep ()
 }
 
 ADD_TRANSLATOR (Fretboard_engraver,
-		/* doc */ "Generate one or more tablature noteheads from event of type NoteEvent.",
+		/* doc */
+                "Generate fret diagram from one or more events of type"
+		" @code{NoteEvent}.",
+
 		/* create */
-		"FretBoard "
-		,
+		"FretBoard ",
 
 		/* read */
-		"stringTunings "
-		"minimumFret "
-		"tablatureFormat "
+                "chordChanges "
 		"highStringOne "
-		,
-		/* write */ "");
+                "maximumFretStretch "
+		"minimumFret "
+                "noteToFretFunction "
+                "predefinedDiagramTable "
+		"stringTunings "
+                "tablatureFormat ",
+
+		/* write */
+		""
+		);