Fail to merge staging - make doc is failing

[James]

Hello,

I cannot merge staging with master as there is an error during make doc.

--snip--

orking into jobs:  (1614 1613 1612 1611 1610 1609 1608 1607)
logfile lilypond-multi-run-3.log (exit 1):
Layout output to 
`/tmp/build-lilypond-autobuild/out/lybook-db/57/lily-ffb6e70b-1.eps'...
Converting to 
`/tmp/build-lilypond-autobuild/out/lybook-db/57/lily-ffb6e70b-1.pdf'...
Writing 
/tmp/build-lilypond-autobuild/out/lybook-db/57/lily-ffb6e70b-systems.texi...
Writing 
/tmp/build-lilypond-autobuild/out/lybook-db/57/lily-ffb6e70b-systems.tex...
Writing 
/tmp/build-lilypond-autobuild/out/lybook-db/57/lily-ffb6e70b-systems.count...
Processing `/tmp/build-lilypond-autobuild/out/lybook-db/90/lily-68ca9147.ly'
Parsing...
Renaming input to: `/tmp/lilypond-autobuild/input/regression/in-note.ly'
Interpreting music...[8][16][24][32][40][48]
Preprocessing graphical objects...Backtrace:
In
Exception during displaying of backtrace: wrong-type-arg

/tmp/build-lilypond-autobuild/out/share/lilypond/current/scm/stencil.scm:56:7: 
In procedure fold in expression (fold (lambda #
 #) (car stils) ...):
/tmp/build-lilypond-autobuild/out/share/lilypond/current/scm/stencil.scm:56:7: 
Wrong type argument in position ~A (expecting ~
A): ~S
fatal error: Children (3) exited with errors.

--snip--

Assuming the 'in-note.ly' is at fault here (this is what 
90/lily-68ca9147.ly' is), this is


--snip--

% ****************************************************************
% ly snippet:
% ****************************************************************
\sourcefilename "/tmp/lilypond-autobuild/input/regression/in-note.ly"
\sourcefileline 0
\version "2.17.6"

\header {
  texidoc = "LilyPond does in-notes.
"
}

#(set-default-paper-size "a6")
\book {
  \relative c' {
    \repeat unfold 5 {
      \once \override FootnoteItem.footnote = ##f
      \footnote
         "" #'(0 . 0)
         \markup { \box \fill-line { "this is a test" } } NoteHead
      \repeat unfold 5 { a\< b c d\! }
      \footnote #'(-1 . 1) "foobar" NoteHead
      \repeat unfold 5 { a\< b c d\! }
    }
  }
}



% ****************************************************************
% end ly snippet
% ****************************************************************
--snip--

Also, probably unrelated I have noticed that if I view

http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=shortlog

I can see the check-in of Frederic Bron marked as being on 'staging' but 
if I view

http://git.savannah.gnu.org/gitweb/?p=lilypond.git;a=shortlog;h=refs/heads/staging

I can see *two* staging tags - the most current one and Frederic's still 
(back '5 days ago')

Regards

James