2002-08-31 Rune Zedeler <rune@zedeler.dk>

	* input/test/sondag-morgen/*.ly: 1.6 compatibility knee fixes

	* lily/tab-note-heads-engraver.cc: Bugfix for instruments not
	having 6 strings.

diff --git a/ChangeLog b/ChangeLog
index f1629762be36fa5204ad499631cc4f67d5cdbcb8..62fd7b49a33c994839178b32787734c726565fdc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2002-08-31 Rune Zedeler  <rune@zedeler.dk>
+
+       * input/test/sondag-morgen/*.ly: 1.6 compatibility knee fixes
+
+       * lily/tab-note-heads-engraver.cc: Bugfix for instruments not
+       having 6 strings.
+       
 2002-08-31  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
        * lily/kpath.cc: 

diff --git a/input/sondag-morgen/sondag-morgen-omkvaed-volta1.ly b/input/sondag-morgen/sondag-morgen-omkvaed-volta1.ly
index ba2ebd3ca19b7da7c5384f538334bb9a8798f250..e307be21481235fb6e88e2020431935353684346 100644 (file)
--- a/input/sondag-morgen/sondag-morgen-omkvaed-volta1.ly
+++ b/input/sondag-morgen/sondag-morgen-omkvaed-volta1.ly
@@ -87,11 +87,13 @@ piar = \notes {
 }
 U = \sustainUp
 D = \sustainDown
+Su = { \su \stemDown }
+Sd = { \sd \stemUp }
 pial = \notes {
     \pial
-    a,, a, e, <h,,8 h,> r <d,,4 d,> e,8 | 
-    e,,8 e, \su <g h d' e' g'> \sd g, g,, \su <g a h d' fis'> \sd e, <a,, a,>~
-    <a,,1 a,> |
+    \stemBoth a,, a, e, <h,,8 h,> r <d,,4 d,> e,8 | 
+    e,,8 e, \Su <g h d' e' g'> \Sd g, g,, \Su <g a h d' fis'> \Sd e, <a,, a,>~
+    \stemBoth <a,,1 a,> |
     <d, d> |
     <d,2 d> r |
 }

diff --git a/input/sondag-morgen/sondag-morgen-omkvaed-volta2.ly b/input/sondag-morgen/sondag-morgen-omkvaed-volta2.ly
index f266c958879d105a30afc395b8a9ff24f833e291..b7bd520831cc5ee18b34e86fe0ccd25d1b321c85 100644 (file)
--- a/input/sondag-morgen/sondag-morgen-omkvaed-volta2.ly
+++ b/input/sondag-morgen/sondag-morgen-omkvaed-volta2.ly
@@ -110,12 +110,15 @@ piar = \notes {
 }
 U = \sustainUp
 D = \sustainDown
+Su = { \su \stemDown }
+Sd = { \sd \stemUp }
+
 pial = \notes {
     \pial
-    a,,8 a, e, <h,,8 h,> r <d,,4 d,> e,8 | 
-    e,,8 e, \su <g h d' e' g'> \sd g, g,, \su <g a h d' fis'> \sd e, a,
-    a,, \su <g a h d' e' > \sd e, h, h,, \su <a h cis' e'> \sd d, e, |
-    <c,1 c>
+    \stemBoth a,,8 a, e, <h,,8 h,> r <d,,4 d,> e,8 | 
+    e,,8 e, \Su <g h d' e' g'> \Sd g, g,, \Su <g a h d' fis'> \Sd e, a,
+    a,, \Su <g a h d' e' > \Sd e, h, h,, \Su <a h cis' e'> \Sd d, e, |
+    \stemBoth <c,1 c>
     <d, d>
     <a,, a,>
     <h,, h,>

diff --git a/input/sondag-morgen/sondag-morgen-omkvaed-volta3.ly b/input/sondag-morgen/sondag-morgen-omkvaed-volta3.ly
index b19d9f362d53152f8f16e496fd8e8b8dcdf725ab..f9e5abd10d1e1d7aba0e83a274d2321a1480a27c 100644 (file)
--- a/input/sondag-morgen/sondag-morgen-omkvaed-volta3.ly
+++ b/input/sondag-morgen/sondag-morgen-omkvaed-volta3.ly
@@ -63,7 +63,7 @@ U = \sustainUp
 D = \sustainDown
 pial = \notes {
     \pial
-    a,,8 a, e, <h,,8 h,> r <d,,4 d,> e,8 | 
+    \stemBoth a,,8 a, e, <h,,8 h,> r <d,,4 d,> e,8 | 
 }
 guitar = \notes {
     \guitar

diff --git a/input/sondag-morgen/sondag-morgen-omkvaed.ly b/input/sondag-morgen/sondag-morgen-omkvaed.ly
index cf9b0970bfddbb03fd6a1fa56f6cead60304cd16..b13d2ea53c36e2324920ac9638be45fc735b1713 100644 (file)
--- a/input/sondag-morgen/sondag-morgen-omkvaed.ly
+++ b/input/sondag-morgen/sondag-morgen-omkvaed.ly
@@ -121,23 +121,25 @@ piar = \notes {
 }
 U = \sustainUp
 D = \sustainDown
+Su = { \su \stemDown }
+Sd = { \sd \stemUp }
 pial = \notes {
     \pial
     \key e \minor
     \clef "F_8"
-    e,,8 e, \su <g h d' e' g'> \sd g, g,, \su <g a h d' fis'> \sd e, a, |
-    a,, \su <g a h d' e' > \sd e, h, h,, \su <a h cis' e'> \sd d, e, |
-    e,,8 e, \su <g h d' e' g'> \sd g, g,, \su <g a h d' fis'> \sd e, a, |
-    a,, a, e, <h,,8 h,> r <d,,4 d,> e,8 | 
+    e,,8 e, \Su <g h d' e' g'> \Sd g, g,, \Su <g a h d' fis'> \Sd e, a, |
+    a,, \Su <g a h d' e' > \Sd e, h, h,, \Su <a h cis' e'> \Sd d, e, |
+    e,,8 e, \Su <g h d' e' g'> \Sd g, g,, \Su <g a h d' fis'> \Sd e, a, |
+    \stemBoth a,, a, e, <h,,8 h,> r <d,,4 d,> e,8 | 
 
-    e,,8 e, \su <g h d' e' g'> \sd g, g,, \su <g a h d' fis'> \sd e, <a,, a,>~
+    e,,8 e, \Su <g h d' e' g'> \Sd g, g,, \Su <g a h d' fis'> \Sd e, <a,, a,>~
     <a,,4. a,> <h,,8 h,>~<h,,4. h,> e,8 |
-    e,,8 e, \su <g h d' e' g'> \sd g, g,, \su <g a h d' fis'> \sd e, a,
-    a,, a, a,, <d,, d,> r <dis,,4 dis,> <e,,8 e,> |
+    e,,8 e, \Su <g h d' e' g'> \Sd g, g,, \Su <g a h d' fis'> \Sd e, a,
+    \stemBoth a,, a, a,, <d,, d,> r <dis,,4 dis,> <e,,8 e,> |
 
-    e,,8 e, \su <g h d' e' g'> \sd g, g,, \su <g a h d' fis'> \sd e, a,
-    a,, \su <g a h d' e'> \sd e, h, h,, \su <a h cis' e'> \sd d, e, |
-    e,,8 e, \su <g h d' e' g'> \sd g, g,, \su <g a h d' fis'> \sd e, a,
+    e,,8 e, \Su <g h d' e' g'> \Sd g, g,, \Su <g a h d' fis'> \Sd e, a,
+    a,, \Su <g a h d' e'> \Sd e, h, h,, \Su <a h cis' e'> \Sd d, e, |
+    e,,8 e, \Su <g h d' e' g'> \Sd g, g,, \Su <g a h d' fis'> \Sd e, a,
 }
 guitar = \notes {
     \guitar

diff --git a/lily/tab-note-heads-engraver.cc b/lily/tab-note-heads-engraver.cc
index a156c160e55627f444d4bfdd9aa10c5b42c82d9e..04c07675e827e41b4258fda683771324dc908d83 100644 (file)
--- a/lily/tab-note-heads-engraver.cc
+++ b/lily/tab-note-heads-engraver.cc
@@ -132,17 +132,10 @@ Tab_note_heads_engraver::process_music ()
 
       SCM text = gh_call3 (proc, gh_int2scm (tab_string), stringTunings, scm_pitch);
 
-      int pos = 2 * tab_string - 2; // No tab-note between the string !!!
+      int pos = 2 * (tab_string-1) - number_of_strings; // No tab-note between the string !!!
       
-      if (number_of_strings % 2) { // odd number of string
-       pos++;
-      }
-
-      
-      note->set_grob_property ("text", text);
-      SCM c0 = get_property ("centralCPosition");
-      if (gh_number_p (c0)) pos += gh_scm2int (c0);
       
+      note->set_grob_property ("text", text);      
       
       note->set_grob_property ("staff-position", gh_int2scm (pos));
       announce_grob (note, req->self_scm());