pick up notes and chord names not lining up with first measure

[john ware]

Hi,

I am having trouble with pickup notes and chord names.
I define ChordNames and a melody expression. The desired output is one pdf
 with the chords and score and a second pdf with just chords and bar lines.

The issue I am having is when the melody has pickup notes. 

I use the "\partial 4" keyword in the melody and "s4" in the chords and 
everything looks perfect in the first pdf; nice looking score with chord
names above.  

However, in the second pdf, having the s4 causes 
extra bar lines to show up in the alternative sections.  

When I remove the s4, the chords only file is fine but the score with 
chords is a mess.

The src is in two files: attached below.

Thanks in advance for any suggestions.

john

%%%%%%%%%%%%%%%%% first file
%PartialSrc.ly

\version "2.12.3"

chordsPartial = \new ChordNames \with {
        \override BarLine #'bar-size = #4
        \override BarLine #'break-visibility = #'#(#t #t #t)
        \consists "Bar_engraver"
     }
     {
           \relative g' \chordmode {
                s4 \repeat volta 2 { \bar "|:" g1 g g e:m  g g g }
                \alternative {{g2 d2}{g2 d2 }}
                }
                
     }

chordsPartialOne = \new ChordNames \with {
     \consists "Bar_engraver"
     }
     {
            \chordsPartial
       }
chordsPartialTwo = \new ChordNames \with {
     \override BarLine #'bar-size = #6
     \override ChordName #'font-size = #6
     \override ChordName #'extra-offset = #'(0 . -1)
     \consists "Bar_engraver"
     }
     {
            \chordsPartial
       }


titlePartial = "Partial"

melodyPartial =  
{ 
\partial 4 \times 2/3 {  d'8 ( e'8  fis'8  -) } 
 
\repeat volta 2 
{
g'4  g'8  fis'8  g'8  a'8  b'8  c''8 
d''8  b'8  g''8  e''8  d''8  b'8  a'8  c''8  
b'8  e'8  e'8  d'8  e'8  fis'8  g'8  a'8
b'8  g'8  a'8  fis'8  g'8  fis'8  e'8 fis'8
g'4  g'8( fis'8)  g'8  a'8  b'8  c''8  
d''8  b'8  g''8  e''8  d''8  b'8  a'8  c''8
b'8  e'8  e'8 d'8 e'8 fis'8 g'8 a'8
}


\alternative {
{b'8  g'8  a'8  fis'8 g'4 \times 2/3 { d'8  e'8 fis'8}}
{ b'8  g'8  a'8 fis'8 g'4  a'4}
}

} % End melody


tempoPartial = \tempo 4=150

%%%%%%%%%%% second file
%Partial.ly

\version "2.12.3"
\include "PartialSrc.ly"
\book { 
        \header { title = \titlePartial }
        \score {
                <<
                \chordsPartialOne
                \new Staff {
                        \tempoPartial
                        \melodyPartial
                }
                >>
                \layout {}
        }
}
\book { 
        \header { title = \titlePartial }
        \score {
                \new Staff {
                        \tempoPartial
                        \unfoldRepeats
                        \melodyPartial
                }
                \midi {}
        }
}
\book { 
        \header { title = \titlePartial }
        \score {
                \chordsPartialTwo
                \layout {}
        }
}