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

[lilypond.git] / Documentation / snippets / showing-the-same-articulation-above-and-below-a-note-or-chord.ly

diff --git a/Documentation/snippets/showing-the-same-articulation-above-and-below-a-note-or-chord.ly b/Documentation/snippets/showing-the-same-articulation-above-and-below-a-note-or-chord.ly
index 721e11769374b4c19e0ac78a5630722a21415fd9..f7c9a3e682441bbbb070b7aa317f8bf8375d24e7 100644 (file)
--- a/Documentation/snippets/showing-the-same-articulation-above-and-below-a-note-or-chord.ly
+++ b/Documentation/snippets/showing-the-same-articulation-above-and-below-a-note-or-chord.ly
@@ -1,49 +1,44 @@
-%% 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 {
   lsrtags = "expressive-marks, tweaks-and-overrides"
 
   texidoc = "
-By default, LilyPond does not allow the same articulation (e.g. an
+By default, LilyPond does not allow the same articulation (e.g., an
 accent, a fermata, a flageolet, etc.) to be displayed above and below a
-note. For example, c4_\\fermata^\\fermata will only show a fermata
-below. The fermata above will simply be ignored. However, one can stick
+note.  For example, @code{c4_\\fermata^\\fermata} will only show a fermata
+below, ignoring the fermata above.  However, one can stick
 scripts (just like fingerings) inside a chord, which means it is
-possible to have as many articulations as desired. This approach has
-the advantage that it ignores the stem and positions the articulation
-relative to the note head. This can be seen in the case of the
-flageolets in the snippet. To mimic the behaviour of scripts outside a
-chord, 'add-stem-support would be required. So, the solution is to
-write the note as a chord and add the articulations inside the <...>.
-The direction will always be above, but one can tweak this via a
-\\tweak: @code{<c-\\tweak #'direction #DOWN-\\fermata^\\fermata>}
-
+possible to have as many articulations as desired.  So, the solution is to
+write the note as a chord and add the articulations inside the @code{<@dots{}>}.
 "
   doctitle = "Showing the same articulation above and below a note or chord"
 } % begin verbatim
 
+
 % The same as \flageolet, just a little smaller
 smallFlageolet =
-#(let ((m (make-music 'ArticulationEvent 'articulation-type "flageolet")))
-   (ly:music-set-property! m 'tweaks
-     (acons 'font-size -2 (ly:music-property m 'tweaks)))
-  m)
+#(let ((m (make-articulation "flageolet")))
+   (set! (ly:music-property m 'tweaks)
+         (acons 'font-size -2
+                (ly:music-property m 'tweaks)))
+   m)
 
 \relative c' {
-  s4^"wrong:"
-  c_\fermata^\fermata % The second fermata is ignored!
-  <e d'>^\smallFlageolet_\smallFlageolet
+  s4^"Wrong:"
+  c4_\fermata^\fermata % The second fermata is ignored!
+  <e d'>4^\smallFlageolet_\smallFlageolet
 
-  % it works only if you wrap the note inside a chord. By default,
-  % all articulations will be printed above, so you have to tweak
-  % the direction.
   s4^"Works if written inside a chord:"
-  <e-\tweak #'direction #DOWN -\smallFlageolet d'^\smallFlageolet>
-  <e-\tweak #'direction #DOWN -\flageolet d'^\flageolet>
-  <e-\tweak #'direction #DOWN -\smallFlageolet^\smallFlageolet>
-  <e-\tweak #'direction #DOWN -\fermata^\fermata>
+  <e_\smallFlageolet d'^\smallFlageolet>4
+  <e_\flageolet d'^\flageolet>4
+  <e_\smallFlageolet^\smallFlageolet>4
+  <e_\fermata^\fermata>4
 }
-