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.

diff --git a/input/regression/tuplet-number-outside-staff-priority.ly b/input/regression/tuplet-number-outside-staff-priority.ly
new file mode 100644 (file)
index 0000000..7b78629
--- /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 ceff2511674011b0c4c75626a72d7600514f4a71..8a4499e2c3c62e4efbe60265d4a1160fb5f91c89 100644 (file)
--- 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 84c3f72f8fbb72c715ebab652bd81c2780b31998..a2e51a604b8d6dd6cb7904fb681f7d974287db61 100644 (file)
--- 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 c25edf31f68a93de749a87e69e26cd4dde6dfc3d..1081377907907cd9860a8a14217798080bfe3034 100644 (file)
--- 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)))