* lily/new-fingering-engraver.cc (position_scripts): take priority

from head position.

* input/regression/finger-chords-order.ly (texidoc): new file.

diff --git a/ChangeLog b/ChangeLog
index cb5d19a0e6dcdaf8d78b339d92f823fc1a9b6f2b..c45dd03451f95a69cb51478c2cd3e3b1826f8ca9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2005-03-15  Han-Wen Nienhuys  <hanwen@xs4all.nl>
+
+       * lily/new-fingering-engraver.cc (position_scripts): take priority
+       from head position.
+
+       * input/regression/finger-chords-order.ly (texidoc): new file.
+
 2005-03-14  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * make/ly-rules.make: 

diff --git a/input/regression/finger-chords-order.ly b/input/regression/finger-chords-order.ly
new file mode 100644 (file)
index 0000000..f085c5e
--- /dev/null
+++ b/input/regression/finger-chords-order.ly
@@ -0,0 +1,20 @@
+\version "2.4.0"
+
+\header {
+
+texidoc = "Ordering of the fingerings depends on vertical ordering of the notes, and  
+is independent of up/down direction."
+
+}
+
+\paper { raggedright = ##t }
+
+\relative {
+       %% input order is not 1 2 3 , output is.
+       <c-1 g'-3 e-2  b'-4 d-5 f-6 a-7 c-8 > 4
+
+       \relative c'' {
+         <a^1 cis^3 e^5>
+         <a_1 cis_3 e_5>
+       }
+}

diff --git a/input/regression/finger-chords.ly b/input/regression/finger-chords.ly
index 8375294da5b4f9c4a83eb9ec361218c1591d44f6..cc33d02bac7fd9727a053bcad12742af79c1f0f8 100644 (file)
--- a/input/regression/finger-chords.ly
+++ b/input/regression/finger-chords.ly
@@ -3,8 +3,10 @@
 \header {
 
 texidoc = "With the new chord syntax, it is possible to associate
-fingerings uniquely with notes. This makes horizontal fingering much
-easier to process."
+fingerings uniquely with notes. This makes it possible to add
+horizontal fingerings to notes.
+
+"
 
 }
     \layout { raggedright= ##t }
@@ -12,10 +14,6 @@ easier to process."
 
 \score {
      \relative c'{
-
-       %% input order is not 1 2 3 , output is.
-       <c-1 g'-3 e-2  b'-4 d-5 f-6 a-7 c-8 > 4 
-
        \set fingeringOrientations = #'(left)
        < c-1  e-2 g-3 b-5 > 4
 
@@ -34,10 +32,7 @@ easier to process."
        \set fingeringOrientations = #'(right)
        < c-1  e-2 g-3 b-5 > 4
 
-
-       
-}
-
+    }
 }
 
 

diff --git a/lily/new-fingering-engraver.cc b/lily/new-fingering-engraver.cc
index f1b02a3509b2f68f7470548dc7c14c697ef9280a..38f4b1d57939e19dc18b2634046a131091985ed3 100644 (file)
--- a/lily/new-fingering-engraver.cc
+++ b/lily/new-fingering-engraver.cc
@@ -252,7 +252,7 @@ New_fingering_engraver::position_scripts ()
       Grob *f = ft.script_;
       f->set_parent (ft.head_, X_AXIS);
       f->set_property ("script-priority",
-                      scm_int2num (finger_prio + i));
+                      scm_int2num (finger_prio + ft.position_));
       f->add_offset_callback (Side_position_interface::aligned_side_proc, Y_AXIS);
       f->add_offset_callback (Self_alignment_interface::centered_on_parent_proc, X_AXIS);
       f->add_offset_callback (Self_alignment_interface::aligned_on_self_proc, X_AXIS);
@@ -267,7 +267,7 @@ New_fingering_engraver::position_scripts ()
       Grob *f = ft.script_;
       f->set_parent (ft.head_, X_AXIS);
       f->set_property ("script-priority",
-                      scm_int2num (finger_prio + down.size () - i));
+                      scm_int2num (finger_prio + down.size () - ft.position_));
 
       f->add_offset_callback (Self_alignment_interface::centered_on_parent_proc, X_AXIS);
       f->add_offset_callback (Self_alignment_interface::aligned_on_self_proc, X_AXIS);

diff --git a/scm/new-markup.scm b/scm/new-markup.scm
index 3b5eb11fcdbdf453578fe75f51855304ee05928e..4842fb44a5237772c9f1e6c4b070cb1cc08557be 100644 (file)
--- a/scm/new-markup.scm
+++ b/scm/new-markup.scm
@@ -1,4 +1,4 @@
-;;;; new-markup.scm -- 
+;;;; new-markup.scm -- Implement a user extensible markup scheme.
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;;