X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=lily%2Fchord-name-engraver.cc;h=59efe683541c8b42ef41dc16d5cbb2c1bbae89cc;hb=0b544cfb7332615ef809b71b57ab656741311ae1;hp=12c25c369db0c00e789a8c5ea4eedb13819fc9c0;hpb=e18531db1f79fb685fbd16d6a2a67bf4b6c09915;p=lilypond.git

diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc
index 12c25c369d..59efe68354 100644
--- a/lily/chord-name-engraver.cc
+++ b/lily/chord-name-engraver.cc
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1998--2010 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1998--2014 Jan Nieuwenhuizen <janneke@gnu.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
@@ -44,8 +44,8 @@ protected:
   DECLARE_TRANSLATOR_LISTENER (rest);
 private:
   Item *chord_name_;
-  vector<Stream_event*> notes_;
- 
+  vector<Stream_event *> notes_;
+
   SCM last_chord_;
   Stream_event *rest_event_;
 };
@@ -70,13 +70,22 @@ Chord_name_engraver::Chord_name_engraver ()
 
 void
 Chord_name_engraver::process_music ()
-{ 
+{
+  if (!rest_event_ && !notes_.size ())
+   return;
+
+  chord_name_ = make_item ("ChordName",
+                           rest_event_ ? rest_event_->self_scm () : notes_[0]->self_scm ());
+
+  SCM maybe_markup = chord_name_->get_property_data ("text");
+
+  bool make_markup = !(Text_interface::is_markup (maybe_markup)
+                       || ly_is_procedure (maybe_markup));
+
   SCM markup;
-  SCM bass = SCM_EOL;
-  SCM inversion = SCM_EOL;
-  SCM pitches = SCM_EOL;
 
-  if (rest_event_)
+  if (rest_event_ && !make_markup) { }
+  else if (rest_event_)
     {
       SCM no_chord_markup = get_property ("noChordSymbol");
       if (!Text_interface::is_markup (no_chord_markup))
@@ -84,65 +93,66 @@ Chord_name_engraver::process_music ()
       markup = no_chord_markup;
     }
   else
-    {  
-      if (!notes_.size ())
-        return;
+    {
+      SCM bass = SCM_EOL;
+      SCM inversion = SCM_EOL;
+      SCM pitches = SCM_EOL;
 
       Stream_event *inversion_event = 0;
       for (vsize i = 0; i < notes_.size (); i++)
-      {
-        Stream_event *n = notes_[i];
-        SCM p = n->get_property ("pitch");
-        if (!unsmob_pitch (p))
-          continue;
-
-        if (n->get_property ("inversion") == SCM_BOOL_T)
         {
-          inversion_event = n;
-          inversion = p;
+          Stream_event *n = notes_[i];
+          SCM p = n->get_property ("pitch");
+          if (!unsmob_pitch (p))
+            continue;
+
+          if (n->get_property ("inversion") == SCM_BOOL_T)
+            {
+              inversion_event = n;
+              inversion = p;
+            }
+          else if (n->get_property ("bass") == SCM_BOOL_T)
+            bass = p;
+          else
+            pitches = scm_cons (p, pitches);
         }
-        else if (n->get_property ("bass") == SCM_BOOL_T)
-          bass = p;
-        else
-          pitches = scm_cons (p, pitches);
-      }
 
       if (inversion_event)
-      {
-        SCM oct = inversion_event->get_property ("octavation");
-        if (scm_is_number (oct))
         {
-          Pitch *p = unsmob_pitch (inversion_event->get_property ("pitch"));
-          int octavation = scm_to_int (oct);
-          Pitch orig = p->transposed (Pitch (-octavation, 0, 0));
-
-          pitches = scm_cons (orig.smobbed_copy (), pitches);
+          SCM oct = inversion_event->get_property ("octavation");
+          if (scm_is_number (oct))
+            {
+              Pitch *p = unsmob_pitch (inversion_event->get_property ("pitch"));
+              int octavation = scm_to_int (oct);
+              Pitch orig = p->transposed (Pitch (-octavation, 0, 0));
+
+              pitches = scm_cons (orig.smobbed_copy (), pitches);
+            }
+          else
+            programming_error ("inversion does not have original pitch");
         }
-        else
-          programming_error ("inversion does not have original pitch");
-      }
 
       pitches = scm_sort_list (pitches, Pitch::less_p_proc);
 
       SCM name_proc = get_property ("chordNameFunction");
-      markup = scm_call_4 (name_proc, pitches, bass, inversion,
-          context ()->self_scm ());
+      if (make_markup)
+        markup = scm_call_4 (name_proc, pitches, bass, inversion,
+                             context ()->self_scm ());
     }
   /*
     Ugh.
   */
-  SCM chord_as_scm = scm_cons (pitches, scm_cons (bass, inversion));
-
-  chord_name_ = make_item ("ChordName", 
-      rest_event_ ? rest_event_->self_scm () : notes_[0]->self_scm ());
-  chord_name_->set_property ("text", markup);
+  if (make_markup)
+    chord_name_->set_property ("text", markup);
+  else if (Text_interface::is_markup (maybe_markup))
+    markup = maybe_markup;
 
-  SCM chord_changes = get_property("chordChanges");
+  SCM chord_changes = get_property ("chordChanges");
   if (to_boolean (chord_changes) && scm_is_pair (last_chord_)
-      && ly_is_equal (chord_as_scm, last_chord_))
+      && ly_is_equal (markup, last_chord_))
     chord_name_->set_property ("begin-of-line-visible", SCM_BOOL_T);
 
-  last_chord_ = chord_as_scm;
+  last_chord_ = markup;
 }
 
 IMPLEMENT_TRANSLATOR_LISTENER (Chord_name_engraver, note);
@@ -156,9 +166,9 @@ IMPLEMENT_TRANSLATOR_LISTENER (Chord_name_engraver, rest);
 void
 Chord_name_engraver::listen_rest (Stream_event *ev)
 {
-  ASSIGN_EVENT_ONCE(rest_event_, ev);
+  ASSIGN_EVENT_ONCE (rest_event_, ev);
 }
-  
+
 void
 Chord_name_engraver::stop_translation_timestep ()
 {
@@ -172,22 +182,22 @@ Chord_name_engraver::stop_translation_timestep ()
   which properties are read depend on the chord naming function active.
 */
 ADD_TRANSLATOR (Chord_name_engraver,
-		/* doc */
-		"Catch note and rest events and generate the appropriate chordname.",
-
-		/* create */
-		"ChordName ",
-
-		/* read */
-		"chordChanges "
-		"chordNameExceptions "
-		"chordNameFunction "
-		"chordNoteNamer "
-		"chordRootNamer "
-		"chordNameExceptions "
-		"majorSevenSymbol "
+                /* doc */
+                "Catch note and rest events and generate the appropriate chordname.",
+
+                /* create */
+                "ChordName ",
+
+                /* read */
+                "chordChanges "
+                "chordNameExceptions "
+                "chordNameFunction "
+                "chordNoteNamer "
+                "chordRootNamer "
+                "chordNameExceptions "
+                "majorSevenSymbol "
                 "noChordSymbol ",
 
-		/* write */
-		""
-		);
+                /* write */
+                ""
+               );