X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fsnippets%2Faccordion-discant-symbols.ly;h=505bda3c57299a86ccac556f802e48f5ffeda9f1;hb=cc86f76536d141c96879ab3a0bd77cd95605227d;hp=c7b4da7a679ae30632b3598a68278c44ed048a0c;hpb=26a079ca2393d053315ef8dbef626c897dc9645a;p=lilypond.git

diff --git a/Documentation/snippets/accordion-discant-symbols.ly b/Documentation/snippets/accordion-discant-symbols.ly
index c7b4da7a67..505bda3c57 100644
--- a/Documentation/snippets/accordion-discant-symbols.ly
+++ b/Documentation/snippets/accordion-discant-symbols.ly
@@ -1,21 +1,23 @@
-%% DO NOT EDIT this file manually; it is automatically
-%% generated from LSR http://lsr.dsi.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.
+% 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.16.0
 \version "2.16.0"
 
 \header {
   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
+@ruser{Accordion Registers}.  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
@@ -34,7 +36,7 @@ dot = \markup {
 accBasson = ^\markup {
   \combine
   \discant
-  \raise #0.5 \dot
+  \translate-scaled #'(0 . 0.5) \dot
 }
 
 % een korig 8 en 16 voets register
@@ -42,18 +44,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
@@ -61,22 +63,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
@@ -84,82 +86,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'' {