From 0ba15dacf827fa96745ac15c449b45fb0b4c11bd Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 15 Mar 2005 10:42:33 +0000
Subject: [PATCH] * lily/new-fingering-engraver.cc (position_scripts): take
 priority from head position.

* input/regression/finger-chords-order.ly (texidoc): new file.
---
 ChangeLog                               |  7 +++++++
 input/regression/finger-chords-order.ly | 20 ++++++++++++++++++++
 input/regression/finger-chords.ly       | 15 +++++----------
 lily/new-fingering-engraver.cc          |  4 ++--
 scm/new-markup.scm                      |  2 +-
 5 files changed, 35 insertions(+), 13 deletions(-)
 create mode 100644 input/regression/finger-chords-order.ly

diff --git a/ChangeLog b/ChangeLog
index cb5d19a0e6..c45dd03451 100644
--- 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
index 0000000000..f085c5ebf2
--- /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 8375294da5..cc33d02bac 100644
--- 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 f1b02a3509..38f4b1d579 100644
--- 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 3b5eb11fcd..4842fb44a5 100644
--- 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
 ;;;; 
-- 
2.39.5