X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fsnippets%2Fflamenco-notation.ly;h=c3cfd54623b28efdbbfbf24e5d3533b1268492dd;hb=a94d26b6693cad58b946a01b7efaaed29480f063;hp=0583274b6ca0a074332735602aa3b1f6df81a065;hpb=25ca54b640c067e2286a1d7ba47f24a1b4dc070e;p=lilypond.git
diff --git a/Documentation/snippets/flamenco-notation.ly b/Documentation/snippets/flamenco-notation.ly
index 0583274b6c..c3cfd54623 100644
--- a/Documentation/snippets/flamenco-notation.ly
+++ b/Documentation/snippets/flamenco-notation.ly
@@ -1,10 +1,10 @@
%% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% 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.17.11"
+\version "2.18.0"
\header {
lsrtags = "fretted-strings, specific-notation, stylesheet, version-specific"
@@ -34,86 +34,54 @@ 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
+ \omit TupletNumber
\override TupletBracket.bracket-visibility = #'if-no-beam
}
tupletsOn = {
\override TupletBracket.bracket-visibility = #'default
- \revert TupletNumber.stencil
+ \undo \omit TupletNumber
}
headsOff = {
- \override TabNoteHead.transparent = ##t
- \override NoteHead.transparent = ##t
+ \hide TabNoteHead
+ \hide NoteHead
\override NoteHead.no-ledgers = ##t
}
@@ -127,105 +95,98 @@ headsOn = {
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
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
\tuplet 5/4 {
- 16^\xUp
+ 16\rasgueado
\headsOff
- ^\aUp
- ^\mUp
- ^\iUp
- ^\iDown~
+
+
+
+ ~
\headsOn
}
2
r4
-
\tupletsOff
\tuplet 3/2 {
- 8^\pDown
+ 8\abanico
\headsOff
- ^\xUp
- ^\iUp
+
+
\headsOn
}
-
\tuplet 3/2 {
- 8^\pDown
+ 8
\headsOff
- ^\xUp
- ^\iUp
+
+
\headsOn
}
-
\tuplet 3/2 {
- 8^\pDown
+ 8
\headsOff
- ^\xUp
- ^\iUp
+
+
\headsOn
}
\tuplet 3/2 {
- 8^\pDown
+ 8
\headsOff
- ^\xUp
- ^\iUp
+
+
\headsOn
}
-
\tupletsOff
\override Beam.positions = #'(2 . 2)
\tuplet 3/2 {
- a8^\markup{ \small p }
- ^\strokeUpGolpe
- ^\strokeDown
+ a8\RHp\alzapua
+
+
}
\tuplet 3/2 {
- a,8^\markup{ \small p }
- ^\strokeUpGolpe
- ^\strokeDown
+ a,8\RHp
+
+
}
\tuplet 3/2 {
- a,8^\markup{ \small p }
- ^\strokeUpGolpe
- ^\strokeDown
+ a,8\RHp
+
+
}
\tuplet 3/2 {
- a,8^\markup{ \small p }
- ^\strokeUpGolpe
- ^\strokeDown
+ 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
}