issues with markup, etc.

[Doug Asherman]

Hi:

I'm having a problem with markup; the test case is in this letter. I 
want to put some markup over the first bar, and it's colliding with the 
fingering marks. See below for the lilypond source.

Also having problems with the \tempo colliding with the fingering marks. 
Again, see below for source.

And, if that's not enough (enough already!), I'd like to have some 
markup something like ^\markup{ Allegretto \tempo 4 = 80 } where the 
text and the metronome marking appear on the same line.

Can anyone point me in the right direction? Thanks.

Doug


\version "2.1.27"
\header {
  title = "testcase"
}

top = \notes \relative c' {
  \time 2/4 \key d \major
  \voiceOne
  \set fingeringOrientations = #'(up)
  % NOTE that tempo collides with fingering marks
  \tempo 4 = 80
  \repeat volta 2 {
    % bar 1
    \stemDown
    % NOTE that markup collides with fingering marks
    b'16-.-1^\markup { Allegretto non troppo }
    d-.-2 fis-.-4 g-.-5 fis-.-4 cis-.-2 fis-.-4 g-.-5
    % bar 2
    fis-.-4 c-.-1 fis-.-4 g-.-4
    <b, fis' b>8.[ e16]
    % bar 3
    b16-.-1 e-.-2 b'-.-4 c-. ais-.-3 e-.-1 ais-. b-.
    % bar 4
    a-.-4 dis,-.-2 a'-.-4 b-.-5
    <e, gis e'>8.[ g16]
  }
}

bottom = \notes \relative b {
  \voiceOne
  \key d \major
  \stemDown
  \repeat volta 2 {
    % bar one
    b,8-. <fis' b d>-.->
    ais,8-. <fis' ais cis>-.->
    % bar two
    a,-. <fis' a c>-.->
    gis,-. <gis' b>-.
    % bar three
    g,-. <g' b e>-.->
    fis, <fis' b e>-.->
    % bar four
    fis,-. <fis' b dis>-.->
    e,-. <e' b' e>-.
  }
}

\score {
  \context PianoStaff <<
    \context Staff = upper <<
      \context Voice = one \top
    >>
    \context Staff = lower <<
      \set Staff.pedalSustainStyle = #'bracket
      \clef bass
      \context Voice = one \bottom
    >>
  >>
  \paper {
    indent = 0
  }
}