Revert "Tempo and Rehearsal marks horizontal positioning; issue 3279"

This reverts commit b6f94447415dded7c6e146b41b6139fe76cb84c4.

Conflicts:

	Documentation/changes.tely

diff --git a/Documentation/changes.tely b/Documentation/changes.tely
index 987dc9699e1ea55f7185b3b22b21e5b83173d8ce..683cdb54fc88e62d6c63f9121911e46d31420160 100644 (file)
--- a/Documentation/changes.tely
+++ b/Documentation/changes.tely
@@ -66,17 +66,6 @@ Grob @code{OctavateEight} was renamed to @code{ClefModifier}.
 Related context properties were renamed from @code{xxxOctavationyyy}
 to @code{xxxTranspositionyyy}.
 
-@item
-Horizontal space is allowed for tempo and rehearsal marks,
-so that these marks do not overlap each other.
-A new command @code{\markLengthOff} turns this feature off.
-@lilypond[quote,relative=0]
-\compressFullBarRests
-\tempo "Molto vivace" c''2 c'
-\mark\default
-\tempo "Meno mosso" R1*16
-@end lilypond
-
 @item
 There is a new @code{\absolute} command explicitly marking music
 as being entered in absolute pitch.  While this has been the

diff --git a/Documentation/learning/tweaks.itely b/Documentation/learning/tweaks.itely
index 5e8365a90893d1f057b85021bea7edc0c5a65d53..9dc53ff8f9dcb331097b863e1877764423c23a14 100644 (file)
--- a/Documentation/learning/tweaks.itely
+++ b/Documentation/learning/tweaks.itely
@@ -2285,9 +2285,6 @@ The command to revert to the default behavior is
 @code{\textLengthOff}.  Alternatively, @code{\once} may be used
 with @code{\textLengthOn} if the effect is to be limited to just a
 single musical moment.
-The corresponding spacing behavior for rehearsal marks and tempo
-indications is independently controlled with the commands
-@code{\markLengthOn} and @code{\markLengthOff}.
 
 @cindex markup text, allowing collisions
 

diff --git a/Documentation/notation/rhythms.itely b/Documentation/notation/rhythms.itely
index 9250fd1968600eaf66e5edb86d121091ceba0771..08d9b7ca13c5c61d9ab56711a1a5f23e3a8e32f0 100644 (file)
--- a/Documentation/notation/rhythms.itely
+++ b/Documentation/notation/rhythms.itely
@@ -1333,24 +1333,6 @@ written by including an empty string in the input:
 d4 g e c
 @end lilypond
 
-@funindex \markLengthOn
-@funindex markLengthOn
-@funindex \markLengthOff
-@funindex markLengthOff
-
-When tempo indications follow each other closely in the music,
-such as in a part for an instrument with long periods of rests,
-the measures are stretched horizontally so that the tempo indications
-do not overlap.  The commands @code{\markLengthOn} and
-@code{\markLengthOff} control this behavior.
-
-@lilypond[quote,relative=0]
-\compressFullBarRests
-\tempo "Molto vivace"
-R1*12
-\tempo "Meno mosso"
-R1*16
-@end lilypond
 
 @snippets
 

diff --git a/Documentation/notation/text.itely b/Documentation/notation/text.itely
index 82c7a209a3476f2a6f1f5535d172fb835f7fc595..e6a085fc56e0b6488be5580168fdd8fafb5e6104 100644 (file)
--- a/Documentation/notation/text.itely
+++ b/Documentation/notation/text.itely
@@ -268,15 +268,6 @@ c1 c
 c  c
 @end lilypond
 
-@funindex \markLengthOn
-@funindex markLengthOn
-@funindex \markLengthOff
-@funindex markLengthOff
-
-@predefined
-@code{\markLengthOn},
-@code{\markLengthOff}.
-@endpredefined
 
 @snippets
 

diff --git a/input/regression/metronome-marking.ly b/input/regression/metronome-marking.ly
index ac115273c3fc834d1f0554f1745a74264be90431..e987176b7e1a08a269b188d2e7975e977ec8e977 100644 (file)
--- a/input/regression/metronome-marking.ly
+++ b/input/regression/metronome-marking.ly
@@ -14,10 +14,10 @@ The marking is left aligned with the time signature, if there is one.
 
 \layout {  ragged-right = ##t }
 
-\version "2.17.17"
+\version "2.16.0"
 
 \relative c'' {
-  \tempo \breve = 100 c1 c1 \tempo "Allegro" 8.. = 50 c1 \tempo "Adagio" c2 c'
+  \tempo \breve = 100 c1 c1 \tempo 8.. = 50 c1
 }
 
 

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 8b5893e22387ff30b3e324b277f2501945fdcb90..12ba88284f9b74f30a4254647d842d255dea8b33 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -90,7 +90,6 @@
   localKeySignature = #'()
   createSpacing = ##t
   ignoreFiguredBassRest = ##f
-  \markLengthOff
 
   %% explicitly set instrument, so we don't get
   %% weird effects when doing instrument names for
@@ -173,7 +172,6 @@ contained staves are not connected vertically."
   \override BarLine.bar-extent = #'(-2 . 2)
   \override VoltaBracket.staff-padding = #3
   \override StaffSymbol.line-count = #1
-  \markLengthOff
 
   \override Stem.neutral-direction = #UP
   \override Beam.neutral-direction = #UP
@@ -706,7 +704,6 @@ automatically when an output definition (a @code{\\score} or
 %%
   figuredBassFormatter = #format-bass-figure
   metronomeMarkFormatter = #format-metronome-markup
-  \markLengthOn
 
 
   %% See also make-voice-props-set

diff --git a/ly/property-init.ly b/ly/property-init.ly
index 93906aa6328b1a6ce5dd52886908eed6f7d06ce4..1c97c04fabf096b6f496cfe9a1ad521fdd59b255 100644 (file)
--- a/ly/property-init.ly
+++ b/ly/property-init.ly
@@ -563,15 +563,6 @@ textLengthOff = {
   \override TextScript.extra-spacing-height = #'(0 . 0)
 }
 
-markLengthOn = {
-  \override Score.MetronomeMark.extra-spacing-width = #'(-0.5 . 0.5)
-  \override Score.RehearsalMark.extra-spacing-width = #'(-0.5 . 0.5)
-}
-
-markLengthOff = {
-  \override Score.MetronomeMark.extra-spacing-width = #'(+inf.0 . -inf.0)
-  \override Score.RehearsalMark.extra-spacing-width = #'(+inf.0 . -inf.0)
-}
 
 %% text spanners
 

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index 846cfedf3ffa2058b80889445130fc06fc90723d..d016c7a2e2a8416989546def3eaa9697793e2b28 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -1447,16 +1447,15 @@
        (after-line-breaking . ,ly:side-position-interface::move-to-extremal-staff)
        (break-visibility . ,end-of-line-invisible)
        (direction . ,UP)
+       (extra-spacing-width . (+inf.0 . -inf.0))
        (outside-staff-horizontal-padding . 0.12)
        (outside-staff-priority . 1000)
-       (outside-staff-padding . 0.5)
+       (padding . 0.8)
        (side-axis . ,Y)
        (skyline-horizontal-padding . 0.2)
        (stencil . ,ly:text-interface::print)
        (vertical-skylines . ,grob::always-vertical-skylines-from-stencil)
-       (Y-offset . ,(ly:make-unpure-pure-container
-                       side-position-interface::y-aligned-side
-                       outside-staff::pure-Y-offset))
+       (Y-offset . ,side-position-interface::y-aligned-side)
        (X-offset . ,(ly:make-simple-closure
                      `(,+
                        ,(ly:make-simple-closure
@@ -1791,11 +1790,12 @@
        (break-align-symbols . (staff-bar key-signature clef))
        (break-visibility . ,end-of-line-invisible)
        (direction . ,UP)
+       (extra-spacing-width . (+inf.0 . -inf.0))
        (font-size . 2)
        (non-musical . #t)
        (outside-staff-horizontal-padding . 0.12)
        (outside-staff-priority . 1500)
-       (outside-staff-padding . 0.5)
+       (padding . 0.8)
        (self-alignment-X . ,CENTER)
        (stencil . ,ly:text-interface::print)
        (vertical-skylines . ,grob::always-vertical-skylines-from-stencil)
@@ -1805,9 +1805,7 @@
                          (list ly:break-alignable-interface::self-align-callback))
                        ,(ly:make-simple-closure
                          (list ly:self-alignment-interface::x-aligned-on-self)))))
-       (Y-offset . ,(ly:make-unpure-pure-container
-                       side-position-interface::y-aligned-side
-                       outside-staff::pure-Y-offset))
+       (Y-offset . ,side-position-interface::y-aligned-side)
        (Y-extent . ,grob::always-Y-extent-from-stencil)
        (meta . ((class . Item)
                 (interfaces . (break-alignable-interface

diff --git a/scm/output-lib.scm b/scm/output-lib.scm
index 41768b5c62639da9b968175abe150879460b65fc..6e2d06a66a81814a7fa711467f3a4e4864ce650d 100644 (file)
--- a/scm/output-lib.scm
+++ b/scm/output-lib.scm
@@ -854,14 +854,6 @@ and duration-log @var{log}."
    the previous calculated offset value."
   prev-offset)
 
-(define-public (outside-staff::pure-Y-offset grob start end)
-  "Initial vertical placement of items such as tempo and
-   rehearsal marks, for use in note-spacing."
-   (* (+ (ly:staff-symbol-staff-radius grob)
-         (ly:grob-property grob 'outside-staff-padding 0.0)
-         1.0)
-      (ly:grob-property grob 'direction CENTER)))
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;