Merge master into nested-bookparts

[lilypond.git] / input / lsr / letter-tablature-formatting.ly

diff --git a/input/lsr/letter-tablature-formatting.ly b/input/lsr/letter-tablature-formatting.ly
index 3fb01d3934945689d4bb8fe8f4cb101d458f4792..03ca74d8c6bb89f4e74282f8521dd9c80b1eb94f 100644 (file)
--- a/input/lsr/letter-tablature-formatting.ly
+++ b/input/lsr/letter-tablature-formatting.ly
@@ -1,14 +1,41 @@
 %% Do not edit this file; it is auto-generated from input/new
 %% This file is in the public domain.
-\version "2.11.38"
+\version "2.11.62"
 
 \header {
-  lsrtags = "fretted-strings"
-  texidoc = "
-You can format a tablature with letters instead of numbers - so that
-0->a, 1->b, 2->c, etc. 
+  lsrtags = "staff-notation,fretted-strings"
 
-BROKEN IN 2.11, COMMENTED OUT."
+  texidoc = "Tablature can be formatted using letters instead of
+numbers."
   doctitle = "Letter tablature formatting"
 } % begin verbatim
-{ c'4 }
+
+#(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
+  d4 e f g
+}
+
+<<
+  \new Staff {
+    \clef "G_8"
+    \music
+  }
+  \new TabStaff \with { 
+    tablatureFormat = #letter-tablature-format
+  }
+  {
+    \music
+  }
+>>