resolve merge

[lilypond.git] / input / lsr / positioning-text-markups-inside-slurs.ly

diff --git a/input/lsr/positioning-text-markups-inside-slurs.ly b/input/lsr/positioning-text-markups-inside-slurs.ly
deleted file mode 100644 (file)
index 3be3e34..0000000
--- a/input/lsr/positioning-text-markups-inside-slurs.ly
+++ /dev/null
@@ -1,31 +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 = "expressive-marks, editorial-annotations, tweaks-and-overrides"
-
-  texidoces = "
-
-Los elementos de marcado de texto deben tener la propiedad
-@code{outside-staff-priority} establecida al valor falso para que se
-impriman por dentro de las ligaduras de expresión.
-
-"
-  doctitlees = "Situar los elementos de marcado de texto por dentro de las ligaduras"
-
-  texidoc = "
-Text markups need to have the @code{outside-staff-priority} property
-set to false in order to be printed inside slurs. 
-
-"
-  doctitle = "Positioning text markups inside slurs"
-} % begin verbatim
-
-\relative c'' {
-  \override TextScript #'avoid-slur = #'inside
-  \override TextScript #'outside-staff-priority = ##f
-  c2(^\markup { \halign #-10 \natural } d4.) c8
-}
-
-