Merge branch '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 1004ca11d9fb4953f9be5198af07b12d0ce7c8dc..14d37d089c1ce9f0f72a3271ceb559b5cae191b5 100644 (file)
--- a/input/lsr/letter-tablature-formatting.ly
+++ b/input/lsr/letter-tablature-formatting.ly
@@ -1,12 +1,42 @@
-%% Do not edit this file; it is auto-generated from LSR!
-%% Tags: guitar
-%%  Do not edit this file; it is auto-generated from LSR!
-\version "2.11.35"
-
-\header { texidoc = "
-You can format a tablature with letters instead of numbers - so that
-0->a, 1->b, 2->c, etc. 
-
-BROKEN IN 2.11, COMMENTED OUT.
-" }
-{ c'4 }
+%% Do not edit this file; it is auto-generated from input/new
+%% This file is in the public domain.
+\version "2.11.62"
+
+\header {
+  lsrtags = "staff-notation,fretted-strings"
+
+  texidoc = "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
+  d4 e f g
+}
+
+<<
+  \new Staff {
+    \clef "G_8"
+    \music
+  }
+  \new TabStaff \with { 
+    tablatureFormat = #letter-tablature-format
+  }
+  {
+    \music
+  }
+>>