static TeXEnvironementData prepareEnvironement(Buffer const & buf, Text const & text,
- ParagraphList::const_iterator pit, odocstream & os, TexRow & texrow,
+ ParagraphList::const_iterator pit, otexstream & os, TexRow & texrow,
OutputParams const & runparams)
{
TeXEnvironementData data;
}
-static void finishEnvironement(odocstream & os, TexRow & texrow,
+static void finishEnvironement(otexstream & os, TexRow & texrow,
OutputParams const & runparams, TeXEnvironementData const & data)
{
if (open_encoding_ == CJK && data.cjk_nested) {
void TeXEnvironment(Buffer const & buf,
Text const & text, OutputParams const & runparams,
- pit_type & pit, odocstream & os, TexRow & texrow)
+ pit_type & pit, otexstream & os, TexRow & texrow)
{
ParagraphList const & paragraphs = text.paragraphs();
ParagraphList::const_iterator par = paragraphs.constIterator(pit);
} // namespace anon
-int latexArgInsets(Paragraph const & par, odocstream & os,
+int latexArgInsets(Paragraph const & par, otexstream & os,
OutputParams const & runparams, unsigned int reqargs,
unsigned int optargs)
{
return lines;
}
+namespace {
+
+// output the proper paragraph start according to latextype.
+void parStartCommand(Paragraph const & par, otexstream & os, TexRow & texrow,
+ OutputParams const & runparams,Layout const & style)
+{
+ switch (style.latextype) {
+ case LATEX_COMMAND:
+ os << '\\' << from_ascii(style.latexname());
+
+ // Separate handling of optional argument inset.
+ if (style.optargs != 0 || style.reqargs != 0) {
+ int ret = latexArgInsets(par, os, runparams, style.reqargs, style.optargs);
+ while (ret > 0) {
+ texrow.newline();
+ --ret;
+ }
+ }
+ else
+ os << from_ascii(style.latexparam());
+ break;
+ case LATEX_ITEM_ENVIRONMENT:
+ case LATEX_LIST_ENVIRONMENT:
+ os << "\\item ";
+ break;
+ case LATEX_BIB_ENVIRONMENT:
+ // ignore this, the inset will write itself
+ break;
+ default:
+ break;
+ }
+}
+
+} // namespace anon
// FIXME: this should be anonymous
void TeXOnePar(Buffer const & buf,
Text const & text,
pit_type pit,
- odocstream & os, TexRow & texrow,
+ otexstream & os, TexRow & texrow,
OutputParams const & runparams_in,
string const & everypar,
int start_pos, int end_pos)
if (style.pass_thru) {
Font const outerfont = text.outerFont(pit);
+ parStartCommand(par, os, texrow,runparams, style);
+
par.latex(bparams, outerfont, os, texrow, runparams, start_pos,
end_pos);
- os << '\n';
+
+ // I did not create a parEndCommand for this minuscule
+ // task because in the other user of parStartCommand
+ // the code is different (JMarc)
+ if (style.isCommand())
+ os << "}\n";
+ else
+ os << '\n';
texrow.newline();
if (!style.parbreak_is_newline) {
os << '\n';
if (i != 0 && encoding->package() == Encoding::CJK)
continue;
- pair<bool, int> enc_switch = switchEncoding(os, bparams, runparams,
- *encoding);
+ pair<bool, int> enc_switch = switchEncoding(os.os(),
+ bparams, runparams, *encoding);
// the following is necessary after a CJK environment in a multilingual
// context (nesting issue).
if (par_language->encoding()->package() == Encoding::CJK
}
}
- switch (style.latextype) {
- case LATEX_COMMAND:
- os << '\\' << from_ascii(style.latexname());
-
- // Separate handling of optional argument inset.
- if (style.optargs != 0 || style.reqargs != 0) {
- int ret = latexArgInsets(par, os, runparams, style.reqargs, style.optargs);
- while (ret > 0) {
- texrow.newline();
- --ret;
- }
- }
- else
- os << from_ascii(style.latexparam());
- break;
- case LATEX_ITEM_ENVIRONMENT:
- case LATEX_LIST_ENVIRONMENT:
- os << "\\item ";
- break;
- case LATEX_BIB_ENVIRONMENT:
- // ignore this, the inset will write itself
- break;
- default:
- break;
- }
+ parStartCommand(par, os, texrow,runparams, style);
Font const outerfont = text.outerFont(pit);
// LaTeX all paragraphs
void latexParagraphs(Buffer const & buf,
Text const & text,
- odocstream & os,
+ otexstream & os,
TexRow & texrow,
OutputParams const & runparams,
string const & everypar)
pit_type pit = runparams.par_begin;
// lastpit is for the language check after the loop.
pit_type lastpit = pit;
+ // variables used in the loop:
+ bool was_title = false;
+ bool already_title = false;
DocumentClass const & tclass = bparams.documentClass();
for (; pit < runparams.par_end; ++pit) {
tclass.plainLayout() : par->layout();
if (layout.intitle) {
- if (runparams.didTitle) {
+ if (already_title) {
LYXERR0("Error in latexParagraphs: You"
" should not mix title layouts"
" with normal ones.");
- } else if (!runparams.inTitle) {
- runparams.inTitle = true;
+ } else if (!was_title) {
+ was_title = true;
if (tclass.titletype() == TITLE_ENVIRONMENT) {
os << "\\begin{"
<< from_ascii(tclass.titlename())
texrow.newline();
}
}
- } else if (runparams.inTitle && !runparams.didTitle) {
+ } else if (was_title && !already_title) {
if (tclass.titletype() == TITLE_ENVIRONMENT) {
os << "\\end{" << from_ascii(tclass.titlename())
<< "}\n";
<< "\n";
}
texrow.newline();
- runparams.didTitle = true;
- runparams.inTitle = false;
+ already_title = true;
+ was_title = false;
}
}
// It might be that we only have a title in this document
- if (runparams.inTitle && !runparams.didTitle) {
+ if (was_title && !already_title) {
if (tclass.titletype() == TITLE_ENVIRONMENT) {
os << "\\end{" << from_ascii(tclass.titlename())
- << "}\n";
- }
- else {
+ << "}\n";
+ } else {
os << "\\" << from_ascii(tclass.titlename())
- << "\n";
- }
+ << "\n";
+ }
texrow.newline();
}
projects / lyx.git / blobdiff