X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fsnippets%2Fflamenco-notation.ly;h=c3cfd54623b28efdbbfbf24e5d3533b1268492dd;hb=730d4eb3e0328e8ba0b376f8191a5bb6ae7f904c;hp=ff4f2d016f1fd23fb8a597d7d89257164995d571;hpb=3ef893f1fe182e9f6cf5841cbff0706789bd3361;p=lilypond.git diff --git a/Documentation/snippets/flamenco-notation.ly b/Documentation/snippets/flamenco-notation.ly index ff4f2d016f..c3cfd54623 100644 --- a/Documentation/snippets/flamenco-notation.ly +++ b/Documentation/snippets/flamenco-notation.ly @@ -1,85 +1,27 @@ -% 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" +%% DO NOT EDIT this file manually; it is automatically +%% generated from LSR http://lsr.di.unimi.it +%% Make any changes in LSR itself, or in Documentation/snippets/new/ , +%% and then run scripts/auxiliar/makelsr.py +%% +%% This file is in the public domain. +\version "2.18.0" \header { -%% Translation of GIT committish: 2d548a99cb9dba80f2ff035582009477cd37eceb - - 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" + lsrtags = "fretted-strings, specific-notation, stylesheet, version-specific" texidoc = " For flamenco guitar, special notation is used: -@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 +* 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 * different letters for fingering (@qq{p}: thumb, @qq{i}: index finger, -@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 +@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 Most figures use arrows in combination with fingering; with abanicos @@ -92,198 +34,159 @@ 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 } -rasgueaso = \markup { \italic Ras. } -alzapua = \markup { \italic Alzapua } - -% Finger stroke symbols -strokeUp = \markup { \postscript #" - 0.1 setlinewidth - 0.5 0 moveto - 0.5 2 lineto - 0.2 1.4 lineto - 0.5 2 moveto - 0.8 1.4 lineto - stroke -"} - -strokeDown = \markup { \postscript #" - 0.1 setlinewidth - 0.5 2 moveto - 0.5 0 lineto - 0.2 0.6 lineto - 0.5 0 moveto - 0.8 0.6 lineto - stroke -"} - -% Golpe symbol -golpe = \markup { \postscript #" - 0.2 setlinewidth - 0 0 moveto - 1 0 lineto - 1 1 lineto - stroke - "\postscript #" - 0.1 setlinewidth - -0.6 -0.1 moveto - -0.6 1.0 lineto - 0.5 1.0 lineto - stroke -"} - -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 } } } +% Text indicators : +abanico = ^\markup\small { \italic Abanico } +rasgueado = ^\markup\small { \italic Ras. } +alzapua = ^\markup\small { \italic Alzapua } + +% Finger stroke symbols : +strokeUp = \markup\combine\override #'(thickness . 1.3) \draw-line #'(0 . 2)\raise #2 \arrow-head #Y #UP ##f +strokeDown = \markup\combine\arrow-head #Y #DOWN ##f \override #'(thickness . 1.3) \draw-line #'(0 . 2) + +% Golpe symbol : +golpe = \markup { + \filled-box #'(0 . 1) #'(0 . 1) #0 + \hspace #-1.6 + \with-color #white + \filled-box #'(0.15 . 0.85) #'(0.15 . 0.85) #0 +} +% Strokes, fingers and golpe command : +RHp = \rightHandFinger #1 +RHi = \rightHandFinger #2 +RHm = \rightHandFinger #3 +RHa = \rightHandFinger #4 +RHx = \rightHandFinger #5 +RHu = \rightHandFinger \strokeUp +RHd = \rightHandFinger \strokeDown +RHg = \rightHandFinger \golpe % Just handy :) tupletOff = { - \once \override TupletNumber #'stencil = ##f - \once \override TupletBracket #'stencil = ##f + \once \omit TupletNumber + \once \omit TupletBracket } tupletsOff = { - \override TupletNumber #'stencil = ##f - \override TupletBracket #'bracket-visibility = #'if-no-beam + \omit TupletNumber + \override TupletBracket.bracket-visibility = #'if-no-beam } tupletsOn = { - \override TupletBracket #'bracket-visibility = #'default - \revert TupletNumber #'stencil + \override TupletBracket.bracket-visibility = #'default + \undo \omit TupletNumber } headsOff = { - \override TabNoteHead #'transparent = ##t - \override NoteHead #'transparent = ##t - \override NoteHead #'no-ledgers = ##t + \hide TabNoteHead + \hide NoteHead + \override NoteHead.no-ledgers = ##t } headsOn = { - \override TabNoteHead #'transparent = ##f - \override NoteHead #'transparent = ##f - \override NoteHead #'no-ledgers = ##f + \override TabNoteHead.transparent = ##f + \override NoteHead.transparent = ##f + \override NoteHead.no-ledgers = ##f } %%%%%%% Cut here ----- End 'flamenco.ly' %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% part = \relative c' { - 8^\iUp - 8^\iDown + \set strokeFingerOrientations = #'(up) + \override StrokeFinger.add-stem-support = ##t + \key a\major + 8 + 8 r4 - r2^\golpe - - 8^\iUp - 8^\iDown - 8^\iUpGolpe - 8^\iDown + r2^\markup\golpe + 8 + 8 + 8 + 8 r2 - - 16^\aUp + 16\rasgueado \headsOff - ^\mUp - ^\iUp - ^\iDown~ + + + ~ \headsOn 2 r4 - \tupletOff - \times 4/5 { - 16^\xUp + \tuplet 5/4 { + 16\rasgueado \headsOff - ^\aUp - ^\mUp - ^\iUp - ^\iDown~ + + + + ~ \headsOn } 2 r4 - \tupletsOff - \times 2/3 { - 8^\pDown + \tuplet 3/2 { + 8\abanico \headsOff - ^\xUp - ^\iUp + + \headsOn } - - \times 2/3 { - 8^\pDown + \tuplet 3/2 { + 8 \headsOff - ^\xUp - ^\iUp + + \headsOn } - - \times 2/3 { - 8^\pDown + \tuplet 3/2 { + 8 \headsOff - ^\xUp - ^\iUp + + \headsOn } - \times 2/3 { - 8^\pDown + \tuplet 3/2 { + 8 \headsOff - ^\xUp - ^\iUp + + \headsOn } - \tupletsOff - \override Beam #'positions = #'(2 . 2) - \times 2/3 { - a8^\markup{ \small p } - ^\strokeUpGolpe - ^\strokeDown + \override Beam.positions = #'(2 . 2) + \tuplet 3/2 { + a8\RHp\alzapua + + } - \times 2/3 { - a,8^\markup{ \small p } - ^\strokeUpGolpe - ^\strokeDown + \tuplet 3/2 { + a,8\RHp + + } - \times 2/3 { - a,8^\markup{ \small p } - ^\strokeUpGolpe - ^\strokeDown + \tuplet 3/2 { + a,8\RHp + + } - \times 2/3 { - a,8^\markup{ \small p } - ^\strokeUpGolpe - ^\strokeDown + \tuplet 3/2 { + a,8\RHp + + } \tupletsOn - - \once \override TextScript #'extra-offset = #'(0 . -1) - 1_\golpe^\mUp + 1 \bar "|." } \score { \new StaffGroup << \context Staff = "part" << - \clef G - \transpose c c' + \clef "G_8" { \part }