From 5b780321bbb9e88a24b924aab8d27d584e5c8eec Mon Sep 17 00:00:00 2001
From: Neil Puttock <address@hidden>
Date: Wed, 27 Aug 2008 23:37:28 +0100
Subject: [PATCH] Allow harmonic note heads to have dots.

Add context property harmonicDots to determine whether
dots should be visible.
---
 input/regression/note-head-harmonic-dotted.ly |   14 ++++++++++++++
 lily/new-fingering-engraver.cc                |    3 ++-
 scm/define-context-properties.scm             |    2 ++
 3 files changed, 18 insertions(+), 1 deletions(-)
 create mode 100644 input/regression/note-head-harmonic-dotted.ly

diff --git a/input/regression/note-head-harmonic-dotted.ly b/input/regression/note-head-harmonic-dotted.ly
new file mode 100644
index 0000000..f7e4f48
--- /dev/null
+++ b/input/regression/note-head-harmonic-dotted.ly
@@ -0,0 +1,14 @@
+\version "2.11.58"
+
+\header {
+  texidoc = "
+Dots on harmonic note heads can be shown by setting the property
address@hidden
+"
+}
+
+\relative c'' {
+  r4 <bes es\harmonic>2.
+  \set harmonicDots = ##t
+  r4 <bes es\harmonic>2.
+}
diff --git a/lily/new-fingering-engraver.cc b/lily/new-fingering-engraver.cc
index fe75842..2749d5c 100644
--- a/lily/new-fingering-engraver.cc
+++ b/lily/new-fingering-engraver.cc
@@ -108,7 +108,7 @@ New_fingering_engraver::acknowledge_rhythmic_head (Grob_info inf)
 	{
 	  inf.grob ()->set_property ("style", ly_symbol2scm ("harmonic"));
 	  Grob *d = unsmob_grob (inf.grob ()->get_object ("dot"));
-	  if (d)
+	  if (d && !to_boolean (get_property ("harmonicDots")))
 	    d->suicide ();
 	}
     }
@@ -358,6 +358,7 @@ ADD_TRANSLATOR (New_fingering_engraver,
 
 		/* read */
 		"fingeringOrientations "
+		"harmonicDots "
 		"strokeFingerOrientations "
 		"stringNumberOrientations ",
 		
diff --git a/scm/define-context-properties.scm b/scm/define-context-properties.scm
index cbd0e15..a7dd3ab 100644
--- a/scm/define-context-properties.scm
+++ b/scm/define-context-properties.scm
@@ -234,6 +234,8 @@ for the full staff.")
 
      (harmonicAccidentals ,boolean? "If set, harmonic notes in chords
 get accidentals.")
+     (harmonicDots ,boolean? "If set, harmonic notes in dotted chords get
+dots.")
      (highStringOne ,boolean? "Whether the first string is the string
 with highest pitch on the instrument.  This used by the automatic
 string selector for tablature notation.")
-- 
1.5.4.3