Merge branch 'master' into translation

[lilypond.git] / Documentation / snippets / letter-tablature-formatting.ly

diff --git a/Documentation/snippets/letter-tablature-formatting.ly b/Documentation/snippets/letter-tablature-formatting.ly
index c4e2df48f19b2e7dd47ea99a22d48290bab3c71d..c6e9215d7271fcb15fd328782d75b7a36cb30b6c 100644 (file)
--- a/Documentation/snippets/letter-tablature-formatting.ly
+++ b/Documentation/snippets/letter-tablature-formatting.ly
@@ -1,10 +1,13 @@
-%% 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.4"
+\version "2.18.0"
 
 \header {
-  lsrtags = "staff-notation, fretted-strings"
+  lsrtags = "fretted-strings, staff-notation"
 
   texidoc = "
 Tablature can be formatted using letters instead of numbers.
@@ -13,16 +16,6 @@ Tablature can be formatted using letters instead of numbers.
   doctitle = "Letter tablature formatting"
 } % begin verbatim
 
-#(define (letter-tablature-format str context event)
-  (let ((tuning (ly:context-property context 'stringTunings))
-        (pitch (ly:event-property event 'pitch)))
-    (make-whiteout-markup
-     (make-vcenter-markup
-      (string (integer->char
-         (+ (char->integer #\a)
-            (- (ly:pitch-semitones pitch)
-            (list-ref tuning (- str 1))))))))))
-
 music = \relative c {
   c4 d e f
   g4 a b c
@@ -35,7 +28,7 @@ music = \relative c {
     \music
   }
   \new TabStaff \with {
-    tablatureFormat = #letter-tablature-format
+    tablatureFormat = #fret-letter-tablature-format
   }
   {
     \music