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

[lilypond.git] / Documentation / snippets / creating-real-parenthesized-dynamics.ly

diff --git a/Documentation/snippets/creating-real-parenthesized-dynamics.ly b/Documentation/snippets/creating-real-parenthesized-dynamics.ly
index 4f67c9b85f04639f8979476b4853c2c2fc76616f..8d6eec5122e20b1e637276462f42d52b9b6dba82 100644 (file)
--- a/Documentation/snippets/creating-real-parenthesized-dynamics.ly
+++ b/Documentation/snippets/creating-real-parenthesized-dynamics.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.14.2"
+\version "2.18.0"
 
 \header {
   lsrtags = "expressive-marks, text, workaround"
@@ -26,11 +26,16 @@ commands such as @code{\\dynamicUp} or @code{\\dynamicDown}.
   doctitle = "Creating \"real\" parenthesized dynamics"
 } % begin verbatim
 
-
-parenF = #(make-dynamic-script (markup #:line (#:normal-text #:italic
-           #:fontsize 2 "(" #:hspace -0.8 #:dynamic "f" #:normal-text
-           #:italic #:fontsize 2 ")")))
+paren =
+#(define-event-function (parser location dyn) (ly:event?)
+   (make-dynamic-script
+    #{ \markup \concat {
+         \normal-text \italic \fontsize #2 (
+        \pad-x #0.2 #(ly:music-property dyn 'text)
+        \normal-text \italic \fontsize #2 )
+       }
+    #}))
 
 \relative c'' {
-  c4\parenF c c \dynamicUp c\parenF
+  c4\paren\f c c \dynamicUp c\paren\p
 }