Merge branch 'master' into lilypond/translation

[lilypond.git] / lily / new-fingering-engraver.cc

diff --git a/lily/new-fingering-engraver.cc b/lily/new-fingering-engraver.cc
index fe75842c0ffa29342119be223e8785219bcefce6..2749d5cb3f623d1c46fd050c2f5b03bf7c9ab784 100644 (file)
--- 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 ",