Re-rename. The last renaming broke monolithic compilation.

This commit is contained in:
Richard Heck 2013-05-02 15:20:50 -04:00
parent edd127f993
commit 9c749331a0

View File

@ -655,7 +655,7 @@ inline void closeItemTag(XHTMLStream & xs, Layout const & lay)
// end of convenience functions // end of convenience functions
ParagraphList::const_iterator searchParagraph( ParagraphList::const_iterator findLastParagraph(
ParagraphList::const_iterator p, ParagraphList::const_iterator p,
ParagraphList::const_iterator const & pend) ParagraphList::const_iterator const & pend)
{ {
@ -666,7 +666,7 @@ ParagraphList::const_iterator searchParagraph(
} }
ParagraphList::const_iterator searchEnvironment( ParagraphList::const_iterator findEndOfEnvironment(
ParagraphList::const_iterator const pstart, ParagraphList::const_iterator const pstart,
ParagraphList::const_iterator const & pend) ParagraphList::const_iterator const & pend)
{ {
@ -888,13 +888,13 @@ ParagraphList::const_iterator makeEnvironment(Buffer const & buf,
// The other possibility is that the depth has increased, in which // The other possibility is that the depth has increased, in which
// case we need to recurse. // case we need to recurse.
else { else {
send = searchEnvironment(par, pend); send = findEndOfEnvironment(par, pend);
par = makeEnvironment(buf, xs, runparams, text, par, send); par = makeEnvironment(buf, xs, runparams, text, par, send);
} }
break; break;
} }
case LATEX_PARAGRAPH: case LATEX_PARAGRAPH:
send = searchParagraph(par, pend); send = findLastParagraph(par, pend);
par = makeParagraphs(buf, xs, runparams, text, par, send); par = makeParagraphs(buf, xs, runparams, text, par, send);
break; break;
// Shouldn't happen // Shouldn't happen
@ -1007,18 +1007,18 @@ void xhtmlParagraphs(Text const & text,
case LATEX_LIST_ENVIRONMENT: case LATEX_LIST_ENVIRONMENT:
case LATEX_ITEM_ENVIRONMENT: { case LATEX_ITEM_ENVIRONMENT: {
// FIXME Same fix here. // FIXME Same fix here.
send = searchEnvironment(par, pend); send = findEndOfEnvironment(par, pend);
par = makeEnvironment(buf, xs, ourparams, text, par, send); par = makeEnvironment(buf, xs, ourparams, text, par, send);
break; break;
} }
case LATEX_BIB_ENVIRONMENT: { case LATEX_BIB_ENVIRONMENT: {
// FIXME Same fix here. // FIXME Same fix here.
send = searchEnvironment(par, pend); send = findEndOfEnvironment(par, pend);
par = makeBibliography(buf, xs, ourparams, text, par, send); par = makeBibliography(buf, xs, ourparams, text, par, send);
break; break;
} }
case LATEX_PARAGRAPH: case LATEX_PARAGRAPH:
send = searchParagraph(par, pend); send = findLastParagraph(par, pend);
par = makeParagraphs(buf, xs, ourparams, text, par, send); par = makeParagraphs(buf, xs, ourparams, text, par, send);
break; break;
} }