#include "ParagraphParameters.h"
#include "TextClass.h"
#include "TexRow.h"
-#include "VSpace.h"
#include "insets/InsetBibitem.h"
#include "insets/InsetArgument.h"
}
-struct TeXEnvironementData
+struct TeXEnvironmentData
{
bool cjk_nested;
Layout const * style;
};
-static TeXEnvironementData prepareEnvironement(Buffer const & buf, Text const & text,
- ParagraphList::const_iterator pit, odocstream & os, TexRow & texrow,
- OutputParams const & runparams)
+static TeXEnvironmentData prepareEnvironment(Buffer const & buf,
+ Text const & text,
+ ParagraphList::const_iterator pit,
+ otexstream & os,
+ OutputParams const & runparams)
{
- TeXEnvironementData data;
+ TeXEnvironmentData data;
BufferParams const & bparams = buf.params();
? (use_prev_env_language ? prev_env_language_
: priorpit->getParLanguage(bparams))
: doc_language;
- string par_lang = data.par_language->babel();
- string prev_par_lang = prev_par_language->babel();
- string doc_lang = doc_language->babel();
- string lang_begin_command = lyxrc.language_command_begin;
- string lang_end_command = lyxrc.language_command_end;
-
- if (runparams.use_polyglossia) {
- par_lang = getPolyglossiaEnvName(data.par_language);
- prev_par_lang = getPolyglossiaEnvName(prev_par_language);
- doc_lang = getPolyglossiaEnvName(doc_language);
- lang_begin_command = "\\begin{$$lang}";
- lang_end_command = "\\end{$$lang}";
- }
+
+ bool const use_pg = runparams.use_polyglossia;
+ string const par_lang = use_pg ?
+ getPolyglossiaEnvName(data.par_language) : data.par_language->babel();
+ string const prev_par_lang = use_pg ?
+ getPolyglossiaEnvName(prev_par_language) : prev_par_language->babel();
+ string const doc_lang = use_pg ?
+ getPolyglossiaEnvName(doc_language) : doc_language->babel();
+ string const lang_begin_command = use_pg ?
+ "\\begin{$$lang}" : lyxrc.language_command_begin;
+ string const lang_end_command = use_pg ?
+ "\\end{$$lang}" : lyxrc.language_command_end;
if (par_lang != prev_par_lang) {
if (!lang_end_command.empty() &&
prev_par_lang))
// the '%' is necessary to prevent unwanted whitespace
<< "%\n";
- texrow.newline();
}
if ((lang_end_command.empty() ||
<< "]";
// the '%' is necessary to prevent unwanted whitespace
os << "%\n";
- texrow.newline();
}
}
os << "\\begin{LyXParagraphLeftIndent}{"
<< from_ascii(pit->params().leftIndent().asLatexString())
<< "}\n";
- texrow.newline();
data.leftindent_open = true;
}
if (style.isEnvironment()) {
os << "\\begin{" << from_ascii(style.latexname()) << '}';
- if (style.optargs != 0 || style.reqargs != 0) {
- int ret = latexArgInsets(*pit, os, runparams, style.reqargs, style.optargs);
- while (ret > 0) {
- texrow.newline();
- --ret;
- }
- }
+ if (style.optargs != 0 || style.reqargs != 0)
+ latexArgInsets(*pit, os, runparams, style.reqargs, style.optargs);
if (style.latextype == LATEX_LIST_ENVIRONMENT) {
os << '{'
<< pit->params().labelWidthString()
<< "}\n";
} else
os << from_ascii(style.latexparam()) << '\n';
- texrow.newline();
}
data.style = &style;
<< "}{" << from_ascii(bparams.fonts_cjk) << "}%\n";
open_encoding_ = CJK;
data.cjk_nested = true;
- texrow.newline();
}
return data;
}
-static void finishEnvironement(odocstream & os, TexRow & texrow,
- OutputParams const & runparams, TeXEnvironementData const & data)
+static void finishEnvironment(otexstream & os, OutputParams const & runparams,
+ TeXEnvironmentData const & data)
{
if (open_encoding_ == CJK && data.cjk_nested) {
// We need to close the encoding even if it does not change
// to do correct environment nesting
os << "\\end{CJK}\n";
- texrow.newline();
open_encoding_ = none;
}
if (data.style->isEnvironment()) {
os << "\\end{" << from_ascii(data.style->latexname()) << "}\n";
- texrow.newline();
prev_env_language_ = data.par_language;
if (runparams.encoding != data.prev_encoding) {
runparams.encoding = data.prev_encoding;
if (data.leftindent_open) {
os << "\\end{LyXParagraphLeftIndent}\n";
- texrow.newline();
prev_env_language_ = data.par_language;
if (runparams.encoding != data.prev_encoding) {
runparams.encoding = data.prev_encoding;
}
-void TeXEnvironment(Buffer const & buf,
- Text const & text, OutputParams const & runparams,
- pit_type & pit, odocstream & os, TexRow & texrow)
+void TeXEnvironment(Buffer const & buf, Text const & text,
+ OutputParams const & runparams,
+ pit_type & pit, otexstream & os)
{
ParagraphList const & paragraphs = text.paragraphs();
ParagraphList::const_iterator par = paragraphs.constIterator(pit);
&& par->params().depth() == current_depth
&& par->params().leftIndent() == current_left_indent) {
// We are still in the same environment so TeXOnePar and continue;
- TeXOnePar(buf, text, pit, os, texrow, runparams);
+ TeXOnePar(buf, text, pit, os, runparams);
continue;
}
// Or par->params().leftIndent() != current_left_indent)
if (par->layout().isParagraph()) {
- // FIXME (Lgb): How to handle this?
+ // FIXME (Lgb): How to handle this?
//&& !suffixIs(os, "\n\n")
// (ARRae) There should be at least one '\n' already but we need there to
// many? i.e. that we sometimes will have
// three in a row.
os << '\n';
- texrow.newline();
}
// FIXME This test should not be necessary.
if (!style.isEnvironment()) {
// This is a standard paragraph, no need to call TeXEnvironment.
- TeXOnePar(buf, text, pit, os, texrow, runparams);
+ TeXOnePar(buf, text, pit, os, runparams);
continue;
}
// This is a new environment.
- TeXEnvironementData const data = prepareEnvironement(buf, text, par,
- os, texrow, runparams);
+ TeXEnvironmentData const data =
+ prepareEnvironment(buf, text, par, os, runparams);
// Recursive call to TeXEnvironment!
- TeXEnvironment(buf, text, runparams, pit, os, texrow);
- finishEnvironement(os, texrow, runparams, data);
+ TeXEnvironment(buf, text, runparams, pit, os);
+ finishEnvironment(os, runparams, data);
}
if (pit != runparams.par_end)
} // namespace anon
-int latexArgInsets(Paragraph const & par, odocstream & os,
+void latexArgInsets(Paragraph const & par, otexstream & os,
OutputParams const & runparams, unsigned int reqargs,
unsigned int optargs)
{
}
if (!reqargs && ilist.size() == 0)
- return 0;
+ return;
- int lines = 0;
bool const have_optional_args = ilist.size() > reqargs;
if (have_optional_args) {
unsigned int todo = ilist.size() - reqargs;
for (unsigned int i = 0; i < todo; ++i) {
InsetArgument const * ins = ilist.front();
ilist.pop_front();
- lines += ins->latexArgument(os, runparams, true);
+ ins->latexArgument(os, runparams, true);
}
}
// arguments.
LASSERT(ilist.size() <= reqargs, /* */);
if (!reqargs)
- return lines;
+ return;
for (unsigned int i = 0; i < reqargs; ++i) {
if (ilist.empty())
else {
InsetArgument const * ins = ilist.front();
ilist.pop_front();
- lines += ins->latexArgument(os, runparams, false);
+ ins->latexArgument(os, runparams, false);
}
}
- return lines;
}
+namespace {
+
+// output the proper paragraph start according to latextype.
+void parStartCommand(Paragraph const & par, otexstream & os,
+ 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)
+ latexArgInsets(par, os, runparams, style.reqargs, style.optargs);
+ 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,
- OutputParams const & runparams_in,
- string const & everypar,
- int start_pos, int end_pos)
+ Text const & text,
+ pit_type pit,
+ otexstream & os,
+ OutputParams const & runparams_in,
+ string const & everypar,
+ int start_pos, int end_pos)
{
BufferParams const & bparams = buf.params();
ParagraphList const & paragraphs = text.paragraphs();
// No newline before first paragraph in this lyxtext
if (pit > 0) {
os << '\n';
- texrow.newline();
- if (!text.inset().getLayout().parbreakIsNewline()) {
+ if (!text.inset().getLayout().parbreakIsNewline())
os << '\n';
- texrow.newline();
- }
}
- par.latex(bparams, outerfont, os, texrow, runparams, start_pos,
- end_pos);
+ par.latex(bparams, outerfont, os, runparams, start_pos, end_pos);
return;
}
if (style.pass_thru) {
Font const outerfont = text.outerFont(pit);
- par.latex(bparams, outerfont, os, texrow, runparams, start_pos,
- end_pos);
- os << '\n';
- texrow.newline();
+ parStartCommand(par, os, runparams, style);
+
+ par.latex(bparams, outerfont, os, runparams, start_pos, end_pos);
+
+ // 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';
if (!style.parbreak_is_newline) {
os << '\n';
- texrow.newline();
} else if (nextpar) {
- Layout const nextstyle = text.inset().forcePlainLayout() ?
- bparams.documentClass().plainLayout() : nextpar->layout();
- if (nextstyle.name() != style.name()) {
+ Layout const nextstyle = text.inset().forcePlainLayout()
+ ? bparams.documentClass().plainLayout()
+ : nextpar->layout();
+ if (nextstyle.name() != style.name())
os << '\n';
- texrow.newline();
- }
}
return;
: priorpar->getParLanguage(bparams))
: outer_language;
- string par_lang = par_language->babel();
- string prev_lang = prev_language->babel();
- string doc_lang = doc_language->babel();
- string outer_lang = outer_language->babel();
- string lang_begin_command = lyxrc.language_command_begin;
- string lang_end_command = lyxrc.language_command_end;
-
- if (runparams.use_polyglossia) {
- par_lang = getPolyglossiaEnvName(par_language);
- prev_lang = getPolyglossiaEnvName(prev_language);
- doc_lang = getPolyglossiaEnvName(doc_language);
- outer_lang = getPolyglossiaEnvName(outer_language);
- lang_begin_command = "\\begin{$$lang}";
- lang_end_command = "\\end{$$lang}";
- }
+
+ bool const use_pg = runparams.use_polyglossia;
+ string const par_lang = use_pg ?
+ getPolyglossiaEnvName(par_language): par_language->babel();
+ string const prev_lang = use_pg ?
+ getPolyglossiaEnvName(prev_language) : prev_language->babel();
+ string const doc_lang = use_pg ?
+ getPolyglossiaEnvName(doc_language) : doc_language->babel();
+ string const outer_lang = use_pg ?
+ getPolyglossiaEnvName(outer_language) : outer_language->babel();
+ string const lang_begin_command = use_pg ?
+ "\\begin{$$lang}" : lyxrc.language_command_begin;
+ string const lang_end_command = use_pg ?
+ "\\end{$$lang}" : lyxrc.language_command_end;
+
if (par_lang != prev_lang
// check if we already put language command in TeXEnvironment()
&& !(style.isEnvironment()
prev_lang))
// the '%' is necessary to prevent unwanted whitespace
<< "%\n";
- texrow.newline();
}
// We need to open a new language if we couldn't close the previous
<< "]";
// the '%' is necessary to prevent unwanted whitespace
os << "%\n";
- texrow.newline();
}
}
}
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
os << "\\begin{CJK}{" << from_ascii(par_language->encoding()->latexName())
<< "}{" << from_ascii(bparams.fonts_cjk) << "}%\n";
open_encoding_ = CJK;
- texrow.newline();
}
if (encoding->package() != Encoding::none && enc_switch.first) {
if (enc_switch.second > 0) {
// the '%' is necessary to prevent unwanted whitespace
os << "%\n";
- texrow.newline();
}
// With CJK, the CJK tag had to be closed first (see above)
if (runparams.encoding->package() == Encoding::CJK) {
par_lang))
// the '%' is necessary to prevent unwanted whitespace
<< "%\n";
- texrow.newline();
}
runparams.encoding = encoding;
}
if (par.allowParagraphCustomization()) {
if (par.params().startOfAppendix()) {
os << "\\appendix\n";
- texrow.newline();
}
if (!par.params().spacing().isDefault()
{
os << from_ascii(par.params().spacing().writeEnvirBegin(useSetSpace))
<< '\n';
- texrow.newline();
}
if (style.isCommand()) {
os << '\n';
- texrow.newline();
}
}
- 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, runparams, style);
Font const outerfont = text.outerFont(pit);
// FIXME UNICODE
os << from_utf8(everypar);
- par.latex(bparams, outerfont, os, texrow, runparams, start_pos, end_pos);
+ par.latex(bparams, outerfont, os, runparams, start_pos, end_pos);
// Make sure that \\par is done with the font of the last
// character if this has another size as the default.
}
bool pending_newline = false;
+ bool unskip_newline = false;
switch (style.latextype) {
case LATEX_ITEM_ENVIRONMENT:
case LATEX_LIST_ENVIRONMENT:
if (par.allowParagraphCustomization()) {
if (!par.params().spacing().isDefault()
&& (runparams.isLastPar || !nextpar->hasSameLayout(par))) {
- if (pending_newline) {
+ if (pending_newline)
os << '\n';
- texrow.newline();
- }
os << from_ascii(par.params().spacing().writeEnvirEnd(useSetSpace));
pending_newline = true;
}
// we need to reset the language at the end of footnote or
// float.
- if (pending_newline) {
+ if (pending_newline)
os << '\n';
- texrow.newline();
- }
+
// when the paragraph uses CJK, the language has to be closed earlier
if (font.language()->encoding()->package() != Encoding::CJK) {
if (lang_end_command.empty()) {
(runparams.isLastPar && runparams.master_language)
? runparams.master_language
: outer_language;
- string const current_lang = runparams.use_polyglossia ?
- getPolyglossiaEnvName(current_language)
+ string const current_lang = runparams.use_polyglossia
+ ? getPolyglossiaEnvName(current_language)
: current_language->babel();
if (!current_lang.empty()) {
os << from_ascii(subst(
"$$lang",
current_lang));
pending_newline = true;
+ unskip_newline = true;
}
} else if (!par_lang.empty()) {
os << from_ascii(subst(
"$$lang",
par_lang));
pending_newline = true;
+ unskip_newline = true;
}
}
}
os << "}";
if (pending_newline) {
+ if (unskip_newline)
+ // prevent unwanted whitespace
+ os << '%';
os << '\n';
- texrow.newline();
}
// if this is a CJK-paragraph and the next isn't, close CJK
break;
// end of main text
if (maintext) {
- os << '\n';
- texrow.newline();
- os << "\\end{CJK}\n";
- texrow.newline();
+ os << "\n\\end{CJK}\n";
// end of an inset
} else
os << "\\end{CJK}";
// http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg145787.html
|| nextpar->params().depth() != par.params().depth()) {
os << '\n';
- texrow.newline();
}
}
// LaTeX all paragraphs
void latexParagraphs(Buffer const & buf,
Text const & text,
- odocstream & os,
- TexRow & texrow,
+ otexstream & os,
OutputParams const & runparams,
string const & everypar)
{
&& bparams.encoding().package() == Encoding::CJK) {
os << "\\begin{CJK}{" << from_ascii(bparams.encoding().latexName())
<< "}{" << from_ascii(bparams.fonts_cjk) << "}%\n";
- texrow.newline();
open_encoding_ = CJK;
}
// if "auto begin" is switched off, explicitly switch the
// language on at start
- string const mainlang = runparams.use_polyglossia ?
- getPolyglossiaEnvName(bparams.language)
+ string const mainlang = runparams.use_polyglossia
+ ? getPolyglossiaEnvName(bparams.language)
: bparams.language->babel();
string const lang_begin_command = runparams.use_polyglossia ?
"\\begin{$$lang}" : lyxrc.language_command_begin;
<< from_ascii(bparams.language->polyglossiaOpts())
<< "]";
os << '\n';
- texrow.newline();
}
ParagraphList const & paragraphs = text.paragraphs();
os << "\\begin{"
<< from_ascii(tclass.titlename())
<< "}\n";
- texrow.newline();
}
}
} else if (was_title && !already_title) {
os << "\\" << from_ascii(tclass.titlename())
<< "\n";
}
- texrow.newline();
already_title = true;
was_title = false;
}
if (!layout.isEnvironment() && par->params().leftIndent().zero()) {
// This is a standard top level paragraph, TeX it and continue.
- TeXOnePar(buf, text, pit, os, texrow, runparams, everypar);
+ TeXOnePar(buf, text, pit, os, runparams, everypar);
continue;
}
- TeXEnvironementData const data = prepareEnvironement(buf, text, par,
- os, texrow, runparams);
+ TeXEnvironmentData const data =
+ prepareEnvironment(buf, text, par, os, runparams);
// pit can be changed in TeXEnvironment.
- TeXEnvironment(buf, text, runparams, pit, os, texrow);
- finishEnvironement(os, texrow, runparams, data);
+ TeXEnvironment(buf, text, runparams, pit, os);
+ finishEnvironment(os, runparams, data);
}
if (pit == runparams.par_end) {
// correctly terminated (because TeXOnePar does
// not add a \n in this case)
//os << '\n';
- //texrow.newline();
}
// It might be that we only have a title in this document
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";
- }
- texrow.newline();
+ << "\n";
+ }
}
// if "auto end" is switched off, explicitly close the language at the end
"$$lang",
mainlang))
<< '\n';
- texrow.newline();
}
// If the last paragraph is an environment, we'll have to close
// CJK at the very end to do proper nesting.
if (maintext && !is_child && open_encoding_ == CJK) {
os << "\\end{CJK}\n";
- texrow.newline();
open_encoding_ = none;
}
projects / lyx.git / blobdiff