#include "support/lstrings.h"
-using lyx::support::subst;
+
+namespace lyx {
+
+using support::subst;
using std::endl;
-using std::ostream;
using std::string;
TeXEnvironment(Buffer const & buf,
ParagraphList const & paragraphs,
ParagraphList::const_iterator pit,
- ostream & os, TexRow & texrow,
+ odocstream & os, TexRow & texrow,
OutputParams const & runparams);
ParagraphList::const_iterator
TeXOnePar(Buffer const & buf,
ParagraphList const & paragraphs,
ParagraphList::const_iterator pit,
- ostream & os, TexRow & texrow,
+ odocstream & os, TexRow & texrow,
OutputParams const & runparams,
string const & everypar = string());
TeXDeeper(Buffer const & buf,
ParagraphList const & paragraphs,
ParagraphList::const_iterator pit,
- ostream & os, TexRow & texrow,
+ odocstream & os, TexRow & texrow,
OutputParams const & runparams)
{
lyxerr[Debug::LATEX] << "TeXDeeper... " << &*pit << endl;
}
+int latexOptArgInsets(Buffer const & buf, Paragraph const & par,
+ odocstream & os, OutputParams const & runparams, int number);
+
+
ParagraphList::const_iterator
TeXEnvironment(Buffer const & buf,
ParagraphList const & paragraphs,
ParagraphList::const_iterator pit,
- ostream & os, TexRow & texrow,
+ odocstream & os, TexRow & texrow,
OutputParams const & runparams)
{
lyxerr[Debug::LATEX] << "TeXEnvironment... " << &*pit << endl;
if (!lyxrc.language_command_end.empty() &&
previous_language->babel() != doc_language->babel()) {
- os << subst(lyxrc.language_command_end, "$$lang",
- previous_language->babel())
+ os << from_ascii(subst(
+ lyxrc.language_command_end,
+ "$$lang",
+ previous_language->babel()))
<< endl;
texrow.newline();
}
if (lyxrc.language_command_end.empty() ||
language->babel() != doc_language->babel()) {
- os << subst(lyxrc.language_command_begin, "$$lang",
- language->babel())
+ os << from_ascii(subst(
+ lyxrc.language_command_begin,
+ "$$lang",
+ language->babel()))
<< endl;
texrow.newline();
}
bool leftindent_open = false;
if (!pit->params().leftIndent().zero()) {
- os << "\\begin{LyXParagraphLeftIndent}{" <<
- pit->params().leftIndent().asLatexString() << "}\n";
+ os << "\\begin{LyXParagraphLeftIndent}{"
+ << from_ascii(pit->params().leftIndent().asLatexString())
+ << "}\n";
texrow.newline();
leftindent_open = true;
}
if (style->isEnvironment()) {
- os << "\\begin{" << style->latexname() << '}';
+ os << "\\begin{" << from_ascii(style->latexname()) << '}';
+ if (style->optionalargs > 0) {
+ int ret = latexOptArgInsets(buf, *pit, os, runparams,
+ style->optionalargs);
+ while (ret > 0) {
+ texrow.newline();
+ --ret;
+ }
+ }
if (style->latextype == LATEX_LIST_ENVIRONMENT) {
- os << "{" << pit->params().labelWidthString() << "}\n";
+ os << '{'
+ << pit->params().labelWidthString()
+ << "}\n";
} else if (style->labeltype == LABEL_BIBLIO) {
// ale970405
- os << "{" << bibitemWidest(buf) << "}\n";
+ os << '{' << bibitemWidest(buf) << "}\n";
} else
- os << style->latexparam() << '\n';
+ os << from_ascii(style->latexparam()) << '\n';
texrow.newline();
}
ParagraphList::const_iterator par = pit;
&& par->params().leftIndent() == pit->params().leftIndent());
if (style->isEnvironment()) {
- os << "\\end{" << style->latexname() << "}\n";
+ os << "\\end{" << from_ascii(style->latexname()) << "}\n";
texrow.newline();
}
int latexOptArgInsets(Buffer const & buf, Paragraph const & par,
- ostream & os, OutputParams const & runparams, int number)
+ odocstream & os, OutputParams const & runparams, int number)
{
int lines = 0;
TeXOnePar(Buffer const & buf,
ParagraphList const & paragraphs,
ParagraphList::const_iterator pit,
- ostream & os, TexRow & texrow,
+ odocstream & os, TexRow & texrow,
OutputParams const & runparams_in,
string const & everypar)
{
if (!lyxrc.language_command_end.empty() &&
previous_language->babel() != doc_language->babel())
{
- os << subst(lyxrc.language_command_end, "$$lang",
- previous_language->babel())
+ os << from_ascii(subst(lyxrc.language_command_end,
+ "$$lang",
+ previous_language->babel()))
<< endl;
texrow.newline();
}
if (lyxrc.language_command_end.empty() ||
language->babel() != doc_language->babel())
{
- os << subst(lyxrc.language_command_begin, "$$lang",
- language->babel())
+ os << from_ascii(subst(
+ lyxrc.language_command_begin,
+ "$$lang",
+ language->babel()))
<< endl;
texrow.newline();
}
}
- if (bparams.inputenc == "auto" &&
- language->encoding() != previous_language->encoding()) {
- os << "\\inputencoding{"
- << language->encoding()->LatexName()
- << "}\n";
- texrow.newline();
+ if (false) {
+ if (bparams.inputenc == "auto" &&
+ language->encoding() != previous_language->encoding()) {
+ os << "\\inputencoding{"
+ << from_ascii(language->encoding()->latexName())
+ << "}\n";
+ texrow.newline();
+ }
}
// In an an inset with unlimited length (all in one row),
&& (pit == paragraphs.begin()
|| !boost::prior(pit)->hasSameLayout(*pit)))
{
- os << pit->params().spacing().writeEnvirBegin() << '\n';
+ os << from_ascii(pit->params().spacing().writeEnvirBegin())
+ << '\n';
texrow.newline();
}
switch (style->latextype) {
case LATEX_COMMAND:
- os << '\\' << style->latexname();
+ os << '\\' << from_ascii(style->latexname());
// Separate handling of optional argument inset.
if (style->optionalargs > 0) {
}
}
else
- os << style->latexparam();
+ os << from_ascii(style->latexparam());
break;
case LATEX_ITEM_ENVIRONMENT:
case LATEX_LIST_ENVIRONMENT:
break;
}
- os << everypar;
+ // FIXME UNICODE
+ os << from_utf8(everypar);
bool need_par = pit->simpleTeXOnePar(buf, bparams,
- outerFont(pit - paragraphs.begin(), paragraphs),
+ outerFont(std::distance(paragraphs.begin(), pit), paragraphs),
os, texrow, runparams);
// Make sure that \\par is done with the font of the last
// We do not need to use to change the font for the last paragraph
// or for a command.
LyXFont const outerfont =
- outerFont(pit - paragraphs.begin(),
-paragraphs);
+ outerFont(std::distance(paragraphs.begin(), pit),
+ paragraphs);
LyXFont const font =
(pit->empty()
&& !is_command) {
if (!need_par)
os << '{';
- os << "\\" << font.latexSize() << " \\par}";
+ os << "\\" << from_ascii(font.latexSize()) << " \\par}";
} else if (need_par) {
os << "\\par}";
} else if (is_command)
&& (boost::next(pit) == paragraphs.end()
|| !boost::next(pit)->hasSameLayout(*pit)))
{
- os << pit->params().spacing().writeEnvirEnd() << '\n';
+ os << from_ascii(pit->params().spacing().writeEnvirEnd())
+ << '\n';
texrow.newline();
}
}
// float.
if (lyxrc.language_command_end.empty())
- os << subst(lyxrc.language_command_begin,
- "$$lang",
- doc_language->babel())
+ os << from_ascii(subst(
+ lyxrc.language_command_begin,
+ "$$lang",
+ doc_language->babel()))
<< endl;
else
- os << subst(lyxrc.language_command_end,
- "$$lang",
- language->babel())
+ os << from_ascii(subst(
+ lyxrc.language_command_end,
+ "$$lang",
+ language->babel()))
<< endl;
texrow.newline();
}
// LaTeX all paragraphs
void latexParagraphs(Buffer const & buf,
ParagraphList const & paragraphs,
- ostream & os,
+ odocstream & os,
TexRow & texrow,
OutputParams const & runparams,
string const & everypar)
ParagraphList::const_iterator par = paragraphs.begin();
ParagraphList::const_iterator endpar = paragraphs.end();
+ BOOST_ASSERT(runparams.par_begin <= runparams.par_end);
+ // if only part of the paragraphs will be outputed
+ if (runparams.par_begin != runparams.par_end) {
+ par = boost::next(paragraphs.begin(), runparams.par_begin);
+ endpar = boost::next(paragraphs.begin(), runparams.par_end);
+ // runparams will be passed to nested paragraphs, so
+ // we have to reset the range parameters.
+ const_cast<OutputParams&>(runparams).par_begin = 0;
+ const_cast<OutputParams&>(runparams).par_end = 0;
+ }
+
// if only_body
while (par != endpar) {
+ ParagraphList::const_iterator lastpar = par;
// well we have to check if we are in an inset with unlimited
// length (all in one row) if that is true then we don't allow
// any special options in the paragraph and also we don't allow
was_title = true;
if (tclass.titletype() == TITLE_ENVIRONMENT) {
os << "\\begin{"
- << tclass.titlename()
+ << from_ascii(tclass.titlename())
<< "}\n";
texrow.newline();
}
}
} else if (was_title && !already_title) {
if (tclass.titletype() == TITLE_ENVIRONMENT) {
- os << "\\end{" << tclass.titlename()
+ os << "\\end{" << from_ascii(tclass.titlename())
<< "}\n";
}
else {
- os << "\\" << tclass.titlename()
+ os << "\\" << from_ascii(tclass.titlename())
<< "\n";
}
texrow.newline();
if (layout->is_environment) {
par = TeXOnePar(buf, paragraphs, par, os, texrow,
- runparams, everypar);
+ runparams, everypar);
} else if (layout->isEnvironment() ||
!par->params().leftIndent().zero())
{
texrow, runparams);
} else {
par = TeXOnePar(buf, paragraphs, par, os, texrow,
- runparams, everypar);
+ runparams, everypar);
}
} else {
par = TeXOnePar(buf, paragraphs, par, os, texrow,
- runparams, everypar);
+ runparams, everypar);
}
+ if (std::distance(lastpar, par) >= std::distance(lastpar, endpar))
+ break;
}
// It might be that we only have a title in this document
if (was_title && !already_title) {
if (tclass.titletype() == TITLE_ENVIRONMENT) {
- os << "\\end{" << tclass.titlename()
+ os << "\\end{" << from_ascii(tclass.titlename())
<< "}\n";
}
else {
- os << "\\" << tclass.titlename()
+ os << "\\" << from_ascii(tclass.titlename())
<< "\n";
}
texrow.newline();
}
}
+
+
+} // namespace lyx
projects / lyx.git / blobdiff