X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fsnippets%2Faccordion-discant-symbols.ly;h=0cecbfdc914bb724fc148f2dd4d5d19443bcae31;hb=ef9512388b15e1e5e2b3592299ffe489ac43abb4;hp=3d01c891547b4c36c91d112e32f224c47d218e85;hpb=da77ae29b4974f89fa168729ffcda756a39688c0;p=lilypond.git

diff --git a/Documentation/snippets/accordion-discant-symbols.ly b/Documentation/snippets/accordion-discant-symbols.ly
index 3d01c89154..0cecbfdc91 100644
--- a/Documentation/snippets/accordion-discant-symbols.ly
+++ b/Documentation/snippets/accordion-discant-symbols.ly
@@ -1,44 +1,27 @@
 %% 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 = "specific-notation, keyboards, workaround, symbols-and-glyphs"
-
-%% Translation of GIT committish: b482c3e5b56c3841a88d957e0ca12964bd3e64fa
-  texidoces = "
-Los símbolos específicos de acordeón discanto se escriben mediante
-@code{\\markup}.  Se puede trucar la colocación vertical de los
-símbolos modificando los argumentos de @code{\\raise}.
-
-"
-  doctitlees = "Símbolos de acordeón discanto"
-
-
-%% Translation of GIT committish: 0a868be38a775ecb1ef935b079000cebbc64de40
-  doctitlede = "Symbole für Akkordeon-Diskantregister"
-  texidocde = "
-Diskantregister für Akkordeon können mit @code{\\markup} dargestellt werden.
-Die vertikale Position der einzelnen Elemente werden mit @code{\\raise}
-angepasst.
-"
+  lsrtags = "keyboards, specific-notation, symbols-and-glyphs, workaround"
 
   texidoc = "
-Accordion discant-specific symbols are added using @code{\\markup}. The
-vertical placement of the symbols can be tweaked by changing the
-@code{\\raise} arguments.
-
-
+This snippet has been obsoleted by predefined markup commands, see
+'Accordion Registers' in the Notation Reference.  It's still useful as
+a simple demonstration of how to combine symbols: the placement of the
+symbols added with @code{\\markup} can be tweaked by changing the
+@code{\\translate-scaled} arguments.  @code{\\translate-scaled} is used
+here rather than @code{\\translate} in order to let the positioning of
+the symbol parts adapt to changes of @code{font-size}.
 
 "
   doctitle = "Accordion-discant symbols"
 } % begin verbatim
 
-
 discant = \markup {
   \musicglyph #"accordion.discant"
 }
@@ -52,7 +35,7 @@ dot = \markup {
 accBasson = ^\markup {
   \combine
   \discant
-  \raise #0.5 \dot
+  \translate-scaled #'(0 . 0.5) \dot
 }
 
 % een korig 8 en 16 voets register
@@ -60,18 +43,18 @@ accBandon = ^\markup {
   \combine
     \discant
     \combine
-      \raise #0.5 \dot
-      \raise #1.5 \dot
+      \translate-scaled #'(0 . 0.5) \dot
+      \translate-scaled #'(0 . 1.5) \dot
 }
 
 accVCello = ^\markup {
   \combine
     \discant
     \combine
-      \raise #0.5 \dot
+      \translate-scaled #'(0 . 0.5) \dot
       \combine
-        \raise #1.5 \dot
-        \translate #'(1 . 0) \raise #1.5 \dot
+        \translate-scaled #'(0 . 1.5) \dot
+        \translate-scaled #'(1 . 1.5) \dot
 }
 
 % 4-8-16 voets register
@@ -79,22 +62,22 @@ accHarmon = ^\markup {
   \combine
     \discant
     \combine
-      \raise #0.5 \dot
+      \translate-scaled #'(0 . 0.5) \dot
       \combine
-        \raise #1.5 \dot
-        \raise #2.5 \dot
+        \translate-scaled #'(0 . 1.5) \dot
+        \translate-scaled #'(0 . 2.5) \dot
 }
 
 accTrombon = ^\markup {
   \combine
     \discant
     \combine
-      \raise #0.5 \dot
+      \translate-scaled #'(0 . 0.5) \dot
       \combine
-        \raise #1.5 \dot
+        \translate-scaled #'(0 . 1.5) \dot
         \combine
-          \translate #'(1 . 0) \raise #1.5 \dot
-          \translate #'(-1 . 0) \raise #1.5 \dot
+          \translate-scaled #'(1 . 1.5) \dot
+          \translate-scaled #'(-1 . 1.5) \dot
 }
 
 % eenkorig 4 en 16 voets register
@@ -102,82 +85,82 @@ accOrgan = ^\markup {
   \combine
     \discant
     \combine
-      \raise #0.5 \dot
-      \raise #2.5 \dot
+      \translate-scaled #'(0 . 0.5) \dot
+      \translate-scaled #'(0 . 2.5) \dot
 }
 
 accMaster = ^\markup {
   \combine
     \discant
     \combine
-      \raise #0.5 \dot
+      \translate-scaled #'(0 . 0.5) \dot
       \combine
-        \raise #1.5 \dot
+        \translate-scaled #'(0 . 1.5) \dot
         \combine
-          \translate #'(1 . 0) \raise #1.5 \dot
+          \translate-scaled #'(1 . 1.5) \dot
           \combine
-            \translate #'(-1 . 0) \raise #1.5 \dot
-            \raise #2.5 \dot
+            \translate-scaled #'(-1 . 1.5) \dot
+            \translate-scaled #'(0 . 2.5) \dot
 }
 
 accAccord = ^\markup {
   \combine
     \discant
     \combine
-      \raise #1.5 \dot
+      \translate-scaled #'(0 . 1.5) \dot
       \combine
-        \translate #'(1 . 0) \raise #1.5 \dot
+        \translate-scaled #'(1 . 1.5) \dot
         \combine
-          \translate #'(-1 . 0) \raise #1.5 \dot
-          \raise #2.5 \dot
+          \translate-scaled #'(-1 . 1.5) \dot
+          \translate-scaled #'(0 . 2.5) \dot
 }
 
 accMusette = ^\markup {
   \combine
     \discant
     \combine
-      \raise #1.5 \dot
+      \translate-scaled #'(0 . 1.5) \dot
       \combine
-        \translate #'(1 . 0) \raise #1.5 \dot
-        \translate #'(-1 . 0) \raise #1.5 \dot
+        \translate-scaled #'(1 . 1.5) \dot
+        \translate-scaled #'(-1 . 1.5) \dot
 }
 
 accCeleste = ^\markup {
   \combine
     \discant
     \combine
-      \raise #1.5 \dot
-      \translate #'(-1 . 0) \raise #1.5 \dot
+      \translate-scaled #'(0 . 1.5) \dot
+      \translate-scaled #'(-1 . 1.5) \dot
 }
 
 accOboe = ^\markup {
   \combine
     \discant
     \combine
-      \raise #1.5 \dot
-      \raise #2.5 \dot
+      \translate-scaled #'(0 . 1.5) \dot
+      \translate-scaled #'(0 . 2.5) \dot
 }
 
 accClarin = ^\markup {
   \combine
     \discant
-    \raise #1.5 \dot
+    \translate-scaled #'(0 . 1.5) \dot
 }
 
 accPiccolo = ^\markup {
     \combine
        \discant
-       \raise #2.5 \dot
+       \translate-scaled #'(0 . 2.5) \dot
 }
 
 accViolin = ^\markup {
   \combine
     \discant
     \combine
-      \raise #1.5 \dot
+      \translate-scaled #'(0 . 1.5) \dot
       \combine
-        \translate #'(1 . 0) \raise #1.5 \dot
-        \raise #2.5 \dot
+        \translate-scaled #'(1 . 1.5) \dot
+        \translate-scaled #'(0 . 2.5) \dot
 }
 
 \relative c'' {
@@ -198,4 +181,3 @@ accViolin = ^\markup {
   c4 d\accPiccolo e f
   c4 d\accViolin e f
 }
-