Merge branch 'master' into translation

[lilypond.git] / ly / engraver-init.ly

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index eade287f1a52fda7c182909dd459074e6a9ce5a6..4d35598887d5c39db36d29f05e14aa718050e415 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -147,6 +147,7 @@
   \accepts "ChoirStaff"
   \accepts "ChordNames"
   \accepts "DrumStaff"
+  \accepts "Dynamics"
   \accepts "FiguredBass"
   \accepts "GrandStaff"
   \accepts "Lyrics"
@@ -620,8 +621,7 @@ automatically when an output definition (a @code{\\score} or
   \accepts "TabStaff"
   \accepts "VaticanaStaff"
 
-  %% (determine-frets #t) would support micro-tones
-  noteToFretFunction = #(determine-frets)
+  noteToFretFunction = #determine-frets
   predefinedDiagramTable = ##f
   soloText = #"Solo"
   soloIIText = #"Solo II"