Occasional lyrics attached to another voice

[Father Gordon Gilbert]

Hey, list,

I have a question about fitting lyrics.  In the file I've pasted below this message is the hymn I am arranging for Barbershop chorus.  The final stanza has all the four parts singing separately, as you can see.  But there are occasional spots, as in stanza 1 where some parts will repeat a lyric.  If you compile this file, you will see on the PDF that the \markup words I put in there follow the notes, rather than being in a nice line.  Can someone suggest how to do this most conveniently?  Each of the *other* three parts (tenor, baritone, bass) might have bits of this in certain spots.

Windoze XP Pro, LilyPond 2.11.14, jEdit 4.4pre9 with LilyPondTool

Blessings,

Father Gordon Gilbert+
--
Fr. Gordon Gilbert
Penetanguishene, ON

\header {
    filename = "AmazingGrace-Sweet-Ads.ly
"
    enteredby = "Gordon Gilbert"
    composer = "Traditional American Melody"
    poet = "words: Rev'd John Newton, 1779"
    arranger = "arr. Gordon Gilbert 2007"
    date=""
    title = "Amazing Grace"
    subtitle = "Arr. for Barbershop Chorus"
    metre = ""
    meter = \metre
    copyright = "Public Domain - Permission granted to perform this arrangement in a not-for-profit setting"
    style = "Hymn"
    mutopiacomposer = \composer
    mutopiapoet=\poet
    maintainer = ""
    maintainerEmail = ""
    lastupdated = "2007/02/04"
}

\version "
2.11.14"
\paper{
    #(set-paper-size "letter")
}

global= {
    \time 3/4
    \key g \major
    
    

}

tenor = \context Voice = "tenor"  \relative c' {
   \voiceOne
       %\override NoteHead #'color = #grey 
    %\override Stem #'color = #grey
    %\override Beam #'color = #grey {
    \partial 4 d4
    b'2 d8 b d2 dis4 e2 c4 b2
    a4 b2 d4 e2 e4 fis2 e4 ^\markup {"like"} d4( ^\markup {"me"} c)
    b4 b2 d4 d2 b4 c4.( e8 e c) b2
    a4 b2 d4 d cis c b4( d) c4 ^ \markup {"I"} b2 ^ \markup {"see"}
    d,4
    b'2 \times 2/3 {d8( c b)} d2 dis4 e2 c4 b2
    a4 b2 \times 2/3 {d8( c b)} e2 e4 fis2 e4 d2
    d4 b2 d4 d2 b4 c2 a4 b2
    a4 b2 d4 d cis c b2 c4 b2
    d,4
    b'2 d4 d2 dis4 e2 c4 b2
    a4 b2 d4 e2 e4 fis2 e4 d2
    d4 b2 d4 d2 b4 c4.( e8 e c) b2
    a4 b2 d4 d cis c b2.
    r2. r r r
     \new Voice = tenorDivisi { \voiceOne
         \transpose g b' {
    r4 r b4 b r4 r d'4 d'4 dis' e'2. c'4 b2. r4
    %     }
   }}
         }
         

lead=\context Voice = "lead"  \relative c'  {
    \voiceTwo
    \override NoteHead #'color = #red 
    \override Stem #'color = #red
    \override Beam #'color = #red {
    \partial 4 d4
    g2 b8( g) b2 a4 g2 e4 d2
    d4 g2 b8( g) b2 a4 d2. ~ d2
    b4 d4.^ "x"( b8) d( b) g2 d4 e4.( g8) g( e) d2
    d4 g2 b8( g) b2 a4 g2 ( fis4 g2) 
    %verse 2
    d4
    g2 \times 2/3 {b8( a g)} b2 a4 g2 e4 d2
    d4 g2 \times 2/3 {b8( a g)} b2 a8.( b16) d2. ~ d2
    b4 d2 \times 2/3 {b8( a g)} b2 b8.( a16) g2 e8.( d16) d2
    d4 g2 \times 2/3 {b8( a g)} b2 a4 g2. ~ g2 
    %verse 3
    d4
    g2 b8( g) b2 a4 g2 e4 d2
    d4 g2 b8( g) b2 a4 d2. ~ d2
    b4 d4.^ "x"( b8) d( b) g2 d4 e4.( g8) g( e) d2
    d4 g2 b8( g) b2 a4 g2. 
    %bridge
    a ^ \markup \italic {"Bridge"} g g f2
    %verse 4
    \key b \major
    \transpose g b' {
    d4 \time 4/4
    g2. b8( g) b2. a4 g2. e4 d2.
    d4 g2. b8( g) b2. a4 d'1 ~ d'2.
    b4 d'2 ~ d'8( b8) d'( b) g2. d4 e2 ~ e8 ( g8) g( e) d2.
    d4 g2. b8( g) b2. a4 g1 ~ g2.
    g4 ^ \markup \italic {"Tag"} 
    a ^ \fermata b ^ \fermata c' ^ \fermata 
    r8 ^ \fermata d'8 d'1 ~ d' ^ \fermata
    }
    \bar "||"
    }
}    
    
bari = \context Voice = "bari" \relative c'   {
    \voiceOne
    \partial 4 d,4 
    g2 g4 g2 fis4 g2 a4 g2 
    a4 b2 b4 cis2 a4 d2 a4 ^ \markup {"like"} a2 ^ \markup {"me"}
    g4 g2 g4 d2 g4 c2 a4 g2
    a4 b2 g4 fis4. g8 fis4 g4( b) a ^ \markup {"I"} g2 ^ \markup {"see"}
    d4 
    g2 g4 d'2 b4 c2 a4 g2 
    a4 b2 b4 a2 a4 d2 a4 a2
    g4 b2 b4 d2 b4 c2 a4 g2
    a4 b2 g4 fis4. e8 fis4 g2. ~ g2
    d4 
    f2 ^ \markup \italic {"Bluesy - Baris, go for the 7ths!"} f4 c'2 b4 bes2 bes4 g2 
    a4 b2 b4 g2 g4 d2 a'4 a2
    g4 g2 g4 d2 b'4 c2 a4 g2
    a4 b2 g4 fis4. e8 fis4 g2.
    r2. r r r
    \new Voice = bariDivisi { \voiceOne
         \transpose g b' {
        r4 r d d r r g, g,
         }         

}}
    
bass = \context Voice = "bass" \relative c  {
    \voiceTwo
    \partial 4 d4
    g,2 b4 d2 b4 c2 e4 g2
    fis4 e2 e4 a2 cis,4 d2 e4 fis( e) d 
    b2 d4 g,2 d'4 c2 e4 g2
    fis4 e2 e4 d e fis g2 d4 _ \markup {"I"} g,2 _ \markup {"see"}
    d'4
    b2 d4 g2 d4 c2 e4 g2
    fis4 e2 e4 a,2 c4 b2.( a2) d4
    g2 g4 b2 b4 c2 a4 g4( g)
    fis4 e2 e4 d e fis g2 d4 g2
    d4
    g,2 b4 d2 b4 c2 e4 f2
    fis4 e2 e4 a,2 cis4 d2( e4 fis d) d
    b2 d4 g,2 b4 c2 e4 g2
    fis4 e2 e4 d e fis g2.
    g2. c, b' fis2
    \key b \major
    \new Voice = bassDivisi { \voiceTwo
    \transpose g b {
    d4
    g2. b4 d2. b,4 c2. e4 g2.
    fis4 e2. e4 a,2. cis4 d2.( e4 fis2 d4) d
    b,2. d4 g,2. b,4 c2. e4 g2.
    fis4 e2. e4 d2( e4) fis g2.( c4 g,2.) 
    g4 c b, a, r8 g, g,1 ~ g,
    }
}}

accomp=\chordmode {
    r4 g2 g4:/b g2:/d b4:7 c2 c4:6/e g2 
    d4:/fis e2.:m a2:9 a4:/cis d2. d2.:7 
}



stanzaa = \lyricmode {
    \set stanza = "1."
    A -- ma -- zing Grace, how sweet the sound
    That saved a wretch like me;__
    I once was lost, but now am found,
    Was blind but now I see. 
    
    \set stanza = "2."
    'Twas grace that taught my heart to fear,
    And grace my fears re -- lieved;
    How pre -- cious did that grace ap -- pear
    The hour I first be -- lieved.
    
    \set stanza = "3."
    Thro' ma -- ny dan -- gers, toils and snares
    I have al -- rea -- dy come;
    'Tis grace hath brought me safe thus far,
    And grace will lead me home.  
    %bridge
    Lead us home, Lord!
    
    \set stanza = "4."
    When we've been there ten thou -- sand years
    Bright shin -- ing as the sun,
    We've no less days to sing God's praise
    Than when we first be -- gun!
    %tag
    We've on -- ly just be -- gun!!
}
tenorwords = \lyricmode {
    When we've been there ten thou -- sand years
}
bariwords = \lyricmode {
    When we've been there ten thou -- sand years
    Bright shi -- ning as the sun
}
basswords = \lyricmode {
    
    When we've been there ten thou -- sand years
    Bright shin -- ing as the sun,
    We've no less days to sing God's praise
    Than when we first be -- gun!
}    
\score {
   % \transpose g ees
 \context ChoirStaff <<
          \context ChordNames \accomp
        \unset ChoirStaff.melismaBusyProperties
       \context Staff ="upper"  { \clef "G" <<
           \global
           \tenor
           \lead
       >>}
        \new Lyrics \with{ alignAboveContext = "upper" } \lyricsto
"tenorDivisi" \tenorwords

       \lyricsto "lead" \context Lyrics = "stanza-1" {
           %\set stanza = "1."
               \stanzaa }

       \context Staff = "lower"  { \clef "F"<<
           \global
           \bari
           \bass
       >>}
       \new Lyrics \with { alignAboveContext = "lower" } \lyricsto
"bariDivisi" \bariwords
    \new Lyrics \with { alignBelowContext = "lower" } \lyricsto
"bassDivisi" \basswords
   >>
 


    
    \layout{
        indent = 0.0\pt
        \context {
            \ChordNames
            \override ChordName  #'style = #'american
            chordChanges = ##t
            }
    }
    \midi {
        \context {
      \Score
      tempoWholesPerMinute = #(ly:make-moment 60 2)
      }
}}