From 3c58e589439162e55851ec336039e5c17011a3da Mon Sep 17 00:00:00 2001
From: Marc Hohl <marc@hohlart.de>
Date: Thu, 15 Oct 2009 08:06:57 +0200
Subject: [PATCH] tablature: fix problems with MultiMeasureRestNumber

Make MultiMeasureRestNumber transparent in standard tablature.
---
 ly/engraver-init.ly |  7 ++++---
 ly/property-init.ly | 18 ++++++++++--------
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 722250d6f4..2a233d719a 100644
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -729,14 +729,12 @@ context."
   \override Stem #'transparent = ##t
   %% automatic beams should be suppressed for similar reasons ...
   autoBeaming = ##f
-  %% ... and we ignore collision warnings that may occur due to
-  %% stem overlapping ...
-  \override NoteColumn #'ignore-collision = ##t
   %% remove beams, dots and rests ...
   \override Beam #'stencil = ##f
   \override Dots #'stencil = ##f
   \override Rest #'stencil = ##f
   \override MultiMeasureRest #'stencil = ##f
+  \override MultiMeasureRestNumber #'transparent = ##t
   %% ... all kinds of ties/slurs
   \override Tie  #'stencil = ##f
   \override RepeatTie #'stencil = ##f
@@ -796,6 +794,9 @@ context."
   \override ParenthesesItem #'stencils = #parentheses-item::calc-tabstaff-parenthesis-stencils
   %% no arpeggios
   \override Arpeggio #'stencil = ##f
+  %% we ignore collision warnings that may occur due to
+  %% stem overlapping, because we have no stems ;-)
+  \override NoteColumn #'ignore-collision = ##t
   %% Special "TAB" clef
   clefGlyph = #"clefs.tab"
   clefPosition = #0
diff --git a/ly/property-init.ly b/ly/property-init.ly
index 95006443f9..4983506c58 100644
--- a/ly/property-init.ly
+++ b/ly/property-init.ly
@@ -375,11 +375,11 @@ tabFullNotation = {
   % time signature
   \revert TabStaff.TimeSignature #'stencil
   % stems (the half note gets a double stem)
-  \revert Stem #'length
-  \revert Stem #'no-stem-extend
-  \revert Stem #'flag-style
-  \revert Stem #'details
-  \revert Stem #'transparent
+  \revert TabVoice.Stem #'length
+  \revert TabVoice.Stem #'no-stem-extend
+  \revert TabVoice.Stem #'flag-style
+  \revert TabVoice.Stem #'details
+  \revert TabVoice.Stem #'transparent
   \override TabVoice.Stem #'stencil = #tabvoice::draw-double-stem-for-half-notes
   \set autoBeaming = ##t
   \revert NoteColumn #'ignore-collision
@@ -392,22 +392,24 @@ tabFullNotation = {
   \revert TabVoice.RepeatTie #'after-line-breaking
   \revert TabVoice.LaissezVibrerTie #'stencil
   \revert TabVoice.Slur #'stencil
-  \revert PhrasingSlur #'stencil
+  \revert TabVoice.PhrasingSlur #'stencil
   % tuplet stuff
   \revert TabVoice.TupletBracket #'stencil
   \revert TabVoice.TupletNumber #'stencil
   % dynamic signs
-  \revert DynamicText #'transparent
-  \revert DynamicTextSpanner #'stencil
+  \revert TabVoice.DynamicText #'transparent
+  \revert TabVoice.DynamicTextSpanner #'stencil
   \revert TabVoice.DynamicTextSpanner #'stencil
   \revert TabVoice.Hairpin #'transparent
   % rests
   \revert TabVoice.Rest #'stencil
   \revert TabVoice.MultiMeasureRest #'stencil
+  \revert TabVoice.MultiMeasureRestNumber #'transparent
   % markups etc.
   \revert TabVoice.Script #'stencil
   \revert TabVoice.TextScript #'stencil
   \revert TabStaff.Arpeggio #'stencil
+  \revert TabStaff.NoteColumn #'ignore-collision
 }
 
 %tie/repeat tie behaviour
-- 
2.39.2