Merge remote-tracking branch 'origin/master' into translation

[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 92968bb9d6f257c9f97762933a1845272f324b96..2277eb5f361a5af3c85fdd68b6b59716bea6a034 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,13 +1,16 @@
-%% Do not edit this file; it is automatically
-%% generated from LSR http://lsr.dsi.unimi.it
+%% 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.13.20"
+\version "2.18.0"
 
 \header {
-  lsrtags = "expressive-marks, tweaks-and-overrides"
+  lsrtags = "expressive-marks, tweaks-and-overrides, version-specific"
 
   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
@@ -19,7 +22,7 @@ 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>}
+\\tweak: @code{<c-\\tweak direction #DOWN-\\fermata^\\fermata>}
 
 "
   doctitle = "Showing the same articulation above and below a note or chord"
@@ -34,17 +37,13 @@ smallFlageolet =
    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
 }
-