From b375521f6040ee5e894e80755e89f2b36795eb1a Mon Sep 17 00:00:00 2001
From: Mike Solomon <mike@apollinemike.com>
Date: Mon, 13 Jun 2011 13:32:17 +0200
Subject: [PATCH] Adds outside-staff-priority for TupletNumber.

Does not automatically resolve script/tuplet-number collisions,
but allows users to set the outside-staff-priority value that
resolves these collisions.
---
 .../tuplet-number-outside-staff-priority.ly       | 15 +++++++++++++++
 lily/tuplet-number.cc                             |  1 +
 scm/define-grobs.scm                              |  1 +
 scm/output-lib.scm                                |  3 +++
 4 files changed, 20 insertions(+)
 create mode 100644 input/regression/tuplet-number-outside-staff-priority.ly

diff --git a/input/regression/tuplet-number-outside-staff-priority.ly b/input/regression/tuplet-number-outside-staff-priority.ly
new file mode 100644
index 0000000000..7b786296bd
--- /dev/null
+++ b/input/regression/tuplet-number-outside-staff-priority.ly
@@ -0,0 +1,15 @@
+\version "2.15.1"
+\header {
+
+  texidoc = "Tuplet numbers' outside staff priority can be
+set."
+
+}
+
+\relative c'' {
+  \times 2/3 { a8\trill a\trill a\trill }
+  \override TupletNumber #'outside-staff-priority = #1
+  \times 2/3 { a8\trill a\trill a\trill }
+  \override Script #'outside-staff-priority = #2
+  \times 2/3 { a8\trill a\trill a\trill }
+}
diff --git a/lily/tuplet-number.cc b/lily/tuplet-number.cc
index ceff251167..8a4499e2c3 100644
--- a/lily/tuplet-number.cc
+++ b/lily/tuplet-number.cc
@@ -82,5 +82,6 @@ ADD_INTERFACE (Tuplet_number,
 	       /* properties */
 	       "avoid-slur " 	// UGH.
 	       "bracket "
+	       "direction "
 	       );
 
diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 84c3f72f8f..a2e51a604b 100644
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -2341,6 +2341,7 @@
      . (
 	(avoid-slur . inside)
 	(cross-staff . ,ly:tuplet-number::calc-cross-staff)
+	(direction . ,tuplet-number::calc-direction)
 	(font-shape . italic)
 	(font-size . -2)
 	(stencil . ,ly:tuplet-number::print)
diff --git a/scm/output-lib.scm b/scm/output-lib.scm
index c25edf31f6..1081377907 100644
--- a/scm/output-lib.scm
+++ b/scm/output-lib.scm
@@ -324,6 +324,9 @@ and duration-log @var{log}."
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Tuplets
 
+(define-public (tuplet-number::calc-direction grob)
+  (ly:tuplet-bracket::calc-direction (ly:grob-object grob 'bracket)))
+
 (define-public (tuplet-number::calc-denominator-text grob)
   (number->string (ly:event-property (event-cause grob) 'denominator)))
 
-- 
2.39.5