Cleanup: TeXEnvironment doesn't need data.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@36897 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Abdelrazak Younes 2010-12-15 23:46:02 +00:00
parent 67e782190a
commit b730b1c8f8

View File

@ -242,8 +242,7 @@ TeXEnvironment(Buffer const & buf,
Text const & text, Text const & text,
ParagraphList::const_iterator pit, ParagraphList::const_iterator pit,
odocstream & os, TexRow & texrow, odocstream & os, TexRow & texrow,
OutputParams const & runparams, OutputParams const & runparams)
TeXEnvironementData const & data)
{ {
LYXERR(Debug::LATEX, "TeXEnvironment... " << &*pit); LYXERR(Debug::LATEX, "TeXEnvironment... " << &*pit);
ParagraphList const & paragraphs = text.paragraphs(); ParagraphList const & paragraphs = text.paragraphs();
@ -292,12 +291,11 @@ TeXEnvironment(Buffer const & buf,
Layout const & style = force_plain_layout Layout const & style = force_plain_layout
? buf.params().documentClass().plainLayout() : par->layout(); ? buf.params().documentClass().plainLayout() : par->layout();
if (style.isEnvironment()) { if (style.isEnvironment()) {
TeXEnvironementData const inner_data = prepareEnvironement(buf, TeXEnvironementData const data = prepareEnvironement(buf,
text, par, os, texrow, runparams); text, par, os, texrow, runparams);
// Recursive call to TeXEnvironment! // Recursive call to TeXEnvironment!
par = TeXEnvironment(buf, text, par, os, texrow, runparams, par = TeXEnvironment(buf, text, par, os, texrow, runparams);
inner_data); finishEnvironement(os, texrow, runparams, data);
finishEnvironement(os, texrow, runparams, inner_data);
} else { } else {
TeXOnePar(buf, text, par, os, texrow, runparams); TeXOnePar(buf, text, par, os, texrow, runparams);
if (par != text.paragraphs().end()) if (par != text.paragraphs().end())
@ -1023,7 +1021,7 @@ void latexParagraphs(Buffer const & buf,
!par->params().leftIndent().zero()) { !par->params().leftIndent().zero()) {
TeXEnvironementData const data = prepareEnvironement(buf, text, TeXEnvironementData const data = prepareEnvironement(buf, text,
par, os, texrow, runparams); par, os, texrow, runparams);
par = TeXEnvironment(buf, text, par, os, texrow, runparams, data); par = TeXEnvironment(buf, text, par, os, texrow, runparams);
finishEnvironement(os, texrow, runparams, data); finishEnvironement(os, texrow, runparams, data);
} else { } else {
TeXOnePar(buf, text, par, os, texrow, runparams, everypar); TeXOnePar(buf, text, par, os, texrow, runparams, everypar);