tab patch 4

diff --git a/lily/stem.cc b/lily/stem.cc
index ed154d38600eafea92d9b4f09e665ac08e8bd8d7..895caf999cab661b59a1b9e912d1cbc8c9dbd202 100644 (file)
--- a/lily/stem.cc
+++ b/lily/stem.cc
@@ -281,7 +281,7 @@ Stem::get_default_stem_end_position (Grob*me)
     
       Direction dir = get_direction (me);
     
-      return dir*  (line_count + 1.5);
+      return dir*  (line_count + 3.5);
     }
   
   bool grace_b = to_boolean (me->get_grob_property ("grace"));

diff --git a/lily/tab-note-heads-engraver.cc b/lily/tab-note-heads-engraver.cc
index 0bae11307e8c9425dfafee2c203d213a31c6e677..81901e31aadcc42188dd232ea991d893772b8ebc 100644 (file)
--- a/lily/tab-note-heads-engraver.cc
+++ b/lily/tab-note-heads-engraver.cc
@@ -155,5 +155,5 @@ ENTER_DESCRIPTION(Tab_note_heads_engraver,
 /* descr */       "Generate one or more tablature noteheads from Music of type Note_req.",
 /* creats*/       "TabNoteHead Dots",
 /* acks  */       "",
-/* reads */       "centralCPosition",
+/* reads */       "centralCPosition stringTunings",
 /* write */       "");

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 5491381a4062dc6231f23e6808b313a4c3d46725..487dea35ceb81495cc54abab548ee5334f0e6cbf 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -454,6 +454,10 @@ TabVoiceContext =   \translator {
       % Draws all stems/beams out of the staff (and not in the middle of the staff !)
       Beam \override #'damping = #100000
       Stem \override #'up-to-staff = ##t
+      
+      % No accidental in tablature !
+      \remove Accidental_engraver
+      Accidental  = \turnOff 
 }
 
 TabStaffContext = \translator {
@@ -479,9 +483,10 @@ TabStaffContext = \translator {
       Stem \override #'avoid-note-head = ##t
       
       % No accidental in tablature !
+      \remove Accidental_engraver
       Accidental  = \turnOff 
       
-      stringTunings = #'(-8 -3 2 7 11 16)
+      stringTunings = #'(4 9 14 19 23 28)
       tablatureFormat = #fret-number-tablature-format
 }
    

diff --git a/make/lilypond.redhat.spec.in b/make/lilypond.redhat.spec.in
index df3de73e08f79d4f5fd94e0c8f71a82e498525ec..c6aa8b349da768344a0cf8b9e8b7a30bc3dbb16f 100644 (file)
--- a/make/lilypond.redhat.spec.in
+++ b/make/lilypond.redhat.spec.in
@@ -91,7 +91,8 @@ rm `find /var/lib/texmf -name 'feta*pk -print' -or -name 'feta*tfm -print'` /tmp
 %endif
 
 
-chkfontpath --add=/usr/share/lilypond/pfa/
+/usr/X11R6/bin/mkfontdir  /usr/share/lilypond/@TOPLEVEL_VERSION@/fonts/type1/
+chkfontpath --add=/usr/share/lilypond/@TOPLEVEL_VERSION@/fonts/type1/
 
 echo 'Please logout first before using LilyPond.'
 
@@ -103,7 +104,8 @@ if [ $1 = 0 ]; then
 fi
 %endif
 
-chkfontpath --remove=/usr/share/lilypond/pfa/
+rm -f /usr/share/lilypond/@TOPLEVEL_VERSION@/fonts/type1/fonts.dir
+chkfontpath --remove=/usr/share/lilypond/@TOPLEVEL_VERSION@/fonts/type1/
 
 %files
 %defattr(-, root, root)