Resolve conflict

[lilypond.git] / input / lsr / ancient-fonts.ly

diff --git a/input/lsr/ancient-fonts.ly b/input/lsr/ancient-fonts.ly
index eef25c714264920812e75dfc4d0794908633cb1d..05e4fdae41e11932c33746bec64361c101525d2f 100644 (file)
--- a/input/lsr/ancient-fonts.ly
+++ b/input/lsr/ancient-fonts.ly
@@ -1,16 +1,27 @@
 %% Do not edit this file; it is auto-generated from LSR http://lsr.dsi.unimi.it
 %% This file is in the public domain.
 %% 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.11.35"
+\version "2.11.62"

 
 \header {
   lsrtags = "ancient-notation"
 
 \header {
   lsrtags = "ancient-notation"

- texidoc = "
+
+  texidoces = "
+Aquí se muestran muchos (¿o quizá todos?) de los símbolos que
+están contemplados por la capacidad de LilyPond para la música
+antigua.
+"
+
+  doctitlees = "Tipografía de música antigua"
+
+  texidoc = "

 Here are shown many (all?) of the symbols that are included in
 LilyPond's support of ancient notation.
 
 
 Here are shown many (all?) of the symbols that are included in
 LilyPond's support of ancient notation.
 
 

-" }
-% begin verbatim
+
+"
+  doctitle = "Ancient fonts"
+} % begin verbatim

 upperStaff = \context GregorianStaff = "upperStaff" <<
   \context GregorianVoice <<
     \set Score.timing = ##f
 upperStaff = \context GregorianStaff = "upperStaff" <<
   \context GregorianVoice <<
     \set Score.timing = ##f