From 277328098ac34dfdefef64ea797b4eadc4aa05b8 Mon Sep 17 00:00:00 2001
From: Marc Hohl <marc@hohlart.de>
Date: Fri, 6 Nov 2009 09:16:40 +0100
Subject: [PATCH] tablature: fix ottava bracket error

Ottava brackets don't have to be displayed in tablature;
a regression test file is adapted to show both the behavior
of multi measure rests and ottava brackets.
---
 input/regression/tablature-full-notation.ly | 10 +++++++---
 ly/engraver-init.ly                         |  7 +++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/input/regression/tablature-full-notation.ly b/input/regression/tablature-full-notation.ly
index 80a48688be..74c088e337 100644
--- a/input/regression/tablature-full-notation.ly
+++ b/input/regression/tablature-full-notation.ly
@@ -1,4 +1,4 @@
-\version "2.13.4"
+\version "2.13.8"
 
 \header{ texidoc = "As default, tablature staves show only the fret numbers, because
                     in most situations, they are combined with normal staves.
@@ -8,14 +8,18 @@
 
 tabstuff = {
   \time 3/4
+  \compressFullBarRests
   c4^"test" d( e)
   f4\f g a^\fermata
+  R2.*3
   c8\<\( c16 c ~ c2\!
   c'2.\)
   \mark \default
   R2.
-  r4 d4 r8 e
-  \times 3/4 { b4 c \glissando d\5 \glissando c }
+  \ottava #1
+  r4 d'4 r8 e
+  \ottava #0
+  \times 3/4 { b,4 c \glissando d\5 \glissando c }
   c4. d-_( e\varcoda)
   ->f g~ a\prall g\thumb e-.
   \bar "|."
diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 0c7bacf74f..659648bcad 100644
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -772,12 +772,13 @@ context."
   \denies "Voice"
   \consists "Tab_staff_symbol_engraver"
 
-  \description "Context for generating tablature. [DOCME]"
+  \description "Context for generating tablature. It accepts only @code{TabVoice}
+contexts and handles the line spacing, the tablature clef etc. properly."
 
   \accepts "TabVoice"
   \defaultchild "TabVoice"
 
-  %% 6 strings
+  %% 6 strings, bigger spacing
   \override StaffSymbol #'staff-space = #1.5
 
   %% Don't draw stems over the tablature figures !
@@ -786,7 +787,9 @@ context."
   %% No accidental in tablature !
   \remove "Accidental_engraver"
   \remove "Key_engraver"
+
   \remove "String_number_engraver"
+  \remove "Ottava_spanner_engraver"
   %% the clef handler
   \override Clef #'stencil = #clef::print-modern-tab-if-set
   %% no time signature
-- 
2.39.2