Merge branch 'master' of git://git.savannah.gnu.org/lilypond.git

[lilypond.git] / Documentation / snippets / flamenco-notation.ly

diff --git a/Documentation/snippets/flamenco-notation.ly b/Documentation/snippets/flamenco-notation.ly
index d1b40d81775f2313644f996127c4cb3a11e5cf28..da6086473b71b8b59b03ed474a13b742250b191b 100644 (file)
--- a/Documentation/snippets/flamenco-notation.ly
+++ b/Documentation/snippets/flamenco-notation.ly
@@ -1,24 +1,85 @@
-%% Do not edit this file; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
-%% This file is in the public domain.
-\version "2.13.10"
+% DO NOT EDIT this file manually; it is automatically
+% generated from Documentation/snippets/new
+% Make any changes in Documentation/snippets/new/
+% and then run scripts/auxiliar/makelsr.py
+%
+% This file is in the public domain.
+%% Note: this file works from version 2.14.0
+\version "2.14.0"
 
 \header {
+%% Translation of GIT committish: 70f5f30161f7b804a681cd080274bfcdc9f4fe8c
+
+  texidoces = "
+
+Para la guitarra flamenca se utilizan ciertos elementos de notación
+especiales:
+
+
+@itemize
+
+@item un símbolo para indicar un golpe sobre la caja de la guitarra
+con el nudillo del dedo anular
+
+@item una flecha para indicar la dirección de los rasgueos
+
+@item distintas legras para las digitaciones (@qq{p}: pulgar, @qq{i}:
+índice, @qq{m}: medio, @qq{a}: anular y @qq{x}: meñique)
+
+@item Rasgueados de 3 y cautro dedos: hacia arriba con todos los dedos
+y terminando con arriba y abajo con el índice
+
+@item abanicos: rasgueos en serie con el pulgar, hacia abajo y el
+meñique y el índice hacia arriba (hay también un abanico 2 en el que
+los dedos medio y anular se usan en lugar del meñique)
+
+@item alza púa: pulsaciones rápidas con el pulgar
+
+@end itemize
+
+
+Casi todas las figuras utilizan flechas combinadas con digitaciones;
+con los abanicos y los rasgueados, las notas se imprimen con cabeza
+sólo en el primer acorde.
+
+Este fragmento de código contiene código de tipo cabecera que se puede
+copiar como @file{flamenco.ly} e incluirse en los documentos fuente.
+
+"
+  doctitlees = "Notación del flamenco"
+
   lsrtags = "fretted-strings"
 
   texidoc = "
 For flamenco guitar, special notation is used:
 
 
-* a golpe symbol to indicate a slap on the guitar body with the nail of
-the ring finger * an arrow to indicate (the direction of) strokes *
+@itemize
+
+@item
+a golpe symbol to indicate a slap on the guitar body with the nail of
+the ring finger
+
+@item
+an arrow to indicate (the direction of) strokes
+
+@item
 different letters for fingering (@qq{p}: thumb, @qq{i}: index finger,
-@qq{m}: middle finger, @qq{a}: ring finger and @qq{x}: little finger) *
-3- and 4-finger rasgueados; stroke upwards with all fingers, ending
-with an up- and down using the index finger * abanicos: strokes (in
-tuples) with thumb (down), little and index finger (both up). There's
-also an abanico 2 where middle and ring finger are used instead of the
-little finger. * alza pua: fast playing with the thumb
+@qq{m}: middle finger, @qq{a}: ring finger and @qq{x}: little finger)
+
+@item
+3- and 4-finger rasgueados: stroke upwards with all fingers, ending
+with an up- and down using the index finger
+
+@item
+abanicos: strokes (in tuples) with thumb (down), little and index finger
+(both up) (there is also an abanico 2 where middle and ring finger are
+used instead of the little finger)
+
+@item
+alza pua: fast playing with the thumb
+
+@end itemize
 
 
 Most figures use arrows in combination with fingering; with abanicos
@@ -31,13 +92,14 @@ This snippet contains some header-like code that can be copied as
   doctitle = "Flamenco notation"
 } % begin verbatim
 
+
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 %%%%%%%  Cut here ----- Start 'flamenco.ly'
 
 % Text indicators
-abanico   = \markup { \italic Abanico }
+abanico = \markup { \italic Abanico }
 rasgueaso = \markup { \italic Ras. }
-alzapua   = \markup { \italic Alzapua }
+alzapua = \markup { \italic Alzapua }
 
 % Finger stroke symbols
 strokeUp = \markup { \postscript #"
@@ -75,20 +137,20 @@ golpe = \markup { \postscript #"
   stroke
 "}
 
-strokeUpGolpe = \markup { \column { \golpe \line { \strokeUp }}}
-iUpGolpe = \markup { \column { \golpe \line { \small i } \line { \strokeUp }}}
+strokeUpGolpe = \markup { \column { \golpe \line { \strokeUp } } }
+iUpGolpe = \markup { \column { \golpe \line { \small i } \line { \strokeUp } } }
 
 % Strokes for all fingers
-pUp   = \markup { \column { \small p \line { \strokeUp }}}
-pDown = \markup { \column { \small p \line { \strokeDown }}}
-iUp   = \markup { \column { \small i \line { \strokeUp }}}
-iDown = \markup { \column { \small i \line { \strokeDown }}}
-mUp   = \markup { \column { \small m \line { \strokeUp }}}
-mDown = \markup { \column { \small m \line { \strokeDown }}}
-aUp   = \markup { \column { \small a \line { \strokeUp }}}
-aDown = \markup { \column { \small a \line { \strokeDown }}}
-xUp   = \markup { \column { \small x \line { \strokeUp }}}
-xDown = \markup { \column { \small x \line { \strokeDown }}}
+pUp   = \markup { \column { \small p \line { \strokeUp } } }
+pDown = \markup { \column { \small p \line { \strokeDown } } }
+iUp   = \markup { \column { \small i \line { \strokeUp } } }
+iDown = \markup { \column { \small i \line { \strokeDown } } }
+mUp   = \markup { \column { \small m \line { \strokeUp } } }
+mDown = \markup { \column { \small m \line { \strokeDown } } }
+aUp   = \markup { \column { \small a \line { \strokeUp } } }
+aDown = \markup { \column { \small a \line { \strokeDown } } }
+xUp   = \markup { \column { \small x \line { \strokeUp } } }
+xDown = \markup { \column { \small x \line { \strokeDown } } }
 
 
 % Just handy :)
@@ -234,5 +296,3 @@ part = \relative c' {
     ragged-right = ##t
   }
 }
-
-