resolve merge

[lilypond.git] / input / lsr / adjusting-lyrics-vertical-spacing.ly

diff --git a/input/lsr/adjusting-lyrics-vertical-spacing.ly b/input/lsr/adjusting-lyrics-vertical-spacing.ly
deleted file mode 100644 (file)
index db1c17c..0000000
--- a/input/lsr/adjusting-lyrics-vertical-spacing.ly
+++ /dev/null
@@ -1,53 +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 = "text, vocal-music, spacing"
-
-  texidoces = "
-Este fragmento de código muestra cómo situar la línea de base de la
-letra más cerca del pentagrama.
-
-"
-  doctitlees = "Ajuste del especiado vertical de la letra"
-
-  texidocfr = "
-Cet extrait illustre la manière de rapprocher la ligne de paroles 
-de la portée.
-
-"
-  doctitlefr = "Ajustement de l'espacement vertical des paroles"
-
-
-  texidoc = "
-This snippet shows how to bring the lyrics line closer to the staff.
-
-"
-  doctitle = "Adjusting lyrics vertical spacing"
-} % begin verbatim
-
-% Default layout:
-<<
-  \new Staff \new Voice = melody \relative c' {
-    c4 d e f
-    g4 f e d
-    c1
-  }
-  \new Lyrics \lyricsto melody { aa aa aa aa aa aa aa aa aa }
-
-% Reducing the minimum space below the staff and above the lyrics:
-  \new Staff \with {
-    \override VerticalAxisGroup #'minimum-Y-extent = #'(-1 . 4)
-  }
-  \new Voice = melody \relative c' {
-    c4 d e f
-    g4 f e d
-    c1
-  }
-  \new Lyrics \with {
-    \override VerticalAxisGroup #'minimum-Y-extent = #'(-1.2 . 1)
-  }
-  \lyricsto melody { aa aa aa aa aa aa aa aa aa }
->>
-