resolve merge

[lilypond.git] / input / lsr / redefining-grace-note-global-defaults.ly

diff --git a/input/lsr/redefining-grace-note-global-defaults.ly b/input/lsr/redefining-grace-note-global-defaults.ly
deleted file mode 100644 (file)
index fdf6fa2..0000000
--- a/input/lsr/redefining-grace-note-global-defaults.ly
+++ /dev/null
@@ -1,35 +0,0 @@
-%% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
-%% This file is in the public domain.
-\version "2.12.3"
-
-\header {
-  lsrtags = "rhythms"
-
-  texidoc = "
-The global defaults for grace notes are stored in the identifiers
-@code{startGraceMusic}, @code{stopGraceMusic},
-@code{startAcciaccaturaMusic}, @code{stopAcciaccaturaMusic},
-@code{startAppoggiaturaMusic} and @code{stopAppoggiaturaMusic}, which
-are defined in the file @code{ly/grace-init.ly}.  By redefining them
-other effects may be obtained.
-
-"
-  doctitle = "Redefining grace note global defaults"
-} % begin verbatim
-
-startAcciaccaturaMusic = {
-  s1*0(
-  \override Stem #'stroke-style = #"grace"
-  \slurDashed
-}
-
-stopAcciaccaturaMusic = {
-  \revert Stem #'stroke-style
-  \slurSolid
-  s1*0)
-}
-
-\relative c'' {
-  \acciaccatura d8 c1
-}
-