]> git.donarmstrong.com Git - lilypond.git/commitdiff
Doc: NR 2.4.1 - add Hammer/Pull snippets
authorJames Lowe <pkx166h@gmail.com>
Mon, 6 Jan 2014 07:14:53 +0000 (07:14 +0000)
committerDavid Kastrup <dak@gnu.org>
Fri, 14 Mar 2014 17:42:27 +0000 (18:42 +0100)
Issue 2594

Added 3 snippets illustrating Hammer-on and Pull-off
in different circumstances

Normal use
With Voices
With Chorded Notes

Included @cindex entries

(cherry picked from commit 51230c664c23bcf4b281d3097afd35a3014714f7)

Documentation/notation/fretted-strings.itely
Documentation/snippets/new/hammer-on-and-pull-off-using-chords.ly [new file with mode: 0644]
Documentation/snippets/new/hammer-on-and-pull-off-using-voices.ly [new file with mode: 0644]
Documentation/snippets/new/hammer-on-and-pull-off.ly [new file with mode: 0644]

index 412295985bfb348461453156168cef0e786fd0de..121dfc0580d83731a42bb7f340ae8243f50cfd90 100644 (file)
@@ -462,6 +462,18 @@ ratioHarmonics = {
 @lilypondfile[verbatim,quote,texidoc,doctitle]
 {chord-glissando-in-tablature.ly}
 
+@cindex hammer on
+@cindex pull off
+
+@lilypondfile[verbatim,quote,texidoc,doctitle]
+{hammer-on-and-pull-off.ly}
+
+@lilypondfile[verbatim,quote,texidoc,doctitle]
+{hammer-on-and-pull-off-using-voices.ly}
+
+@lilypondfile[verbatim,quote,texidoc,doctitle]
+{hammer-on-and-pull-off-using-chords.ly}
+
 @seealso
 Notation Reference:
 @ref{Chord repetition},
diff --git a/Documentation/snippets/new/hammer-on-and-pull-off-using-chords.ly b/Documentation/snippets/new/hammer-on-and-pull-off-using-chords.ly
new file mode 100644 (file)
index 0000000..980707d
--- /dev/null
@@ -0,0 +1,21 @@
+\version "2.16.0"
+
+\header {
+  lsrtags = "editorial-annotations, fretted-strings"
+
+  texidoc = "
+When using hammer-on or pull-off with chorded notes, only a single arc
+is drawn. However @q{double arcs} are possible by setting the
+@code{doubleSlurs} property to @code{#t}.
+
+"
+  doctitle = "Hammer on and pull off using chords"
+}
+
+\new TabStaff {
+  \relative c' {
+    % chord hammer-on and pull-off
+    \set doubleSlurs = ##t
+    <g' b>8( <a c> <g b>)
+  }
+}
diff --git a/Documentation/snippets/new/hammer-on-and-pull-off-using-voices.ly b/Documentation/snippets/new/hammer-on-and-pull-off-using-voices.ly
new file mode 100644 (file)
index 0000000..d22a7f9
--- /dev/null
@@ -0,0 +1,20 @@
+\version "2.16.0"
+
+\header {
+  lsrtags = "editorial-annotations, fretted-strings"
+
+  texidoc = "
+The arc of hammer-on and pull-off is upwards in voices one and three and
+downwards in voices two and four:
+
+"
+  doctitle = "Hammer on and pull off using voices"
+}
+
+\new TabStaff {
+  \relative c' {
+    << { \voiceOne g2( a) }
+    \\ { \voiceTwo a,( b) }
+    >> \oneVoice
+  }
+}
diff --git a/Documentation/snippets/new/hammer-on-and-pull-off.ly b/Documentation/snippets/new/hammer-on-and-pull-off.ly
new file mode 100644 (file)
index 0000000..c5b283b
--- /dev/null
@@ -0,0 +1,18 @@
+\version "2.16.0"
+
+\header {
+  lsrtags = "editorial-annotations, fretted-strings"
+
+  texidoc = "
+Hammer-on and pull-off can be obtained using slurs.
+
+"
+  doctitle = "Hammer on and pull off"
+}
+
+\new TabStaff {
+  \relative c' {
+    d4( e\2)
+    a( g)
+  }
+}