#include "support/lstrings.h"
-using lyx::support::subst;
+
+namespace lyx {
+
+using support::subst;
using std::endl;
-using lyx::odocstream;
using std::string;
if (!lyxrc.language_command_end.empty() &&
previous_language->babel() != doc_language->babel()) {
- os << lyx::from_ascii(subst(
+ os << from_ascii(subst(
lyxrc.language_command_end,
"$$lang",
previous_language->babel()))
- << endl;
+ << '\n';
texrow.newline();
}
if (lyxrc.language_command_end.empty() ||
language->babel() != doc_language->babel()) {
- os << lyx::from_ascii(subst(
+ os << from_ascii(subst(
lyxrc.language_command_begin,
"$$lang",
language->babel()))
- << endl;
+ << '\n';
texrow.newline();
}
}
bool leftindent_open = false;
if (!pit->params().leftIndent().zero()) {
os << "\\begin{LyXParagraphLeftIndent}{"
- << lyx::from_ascii(pit->params().leftIndent().asLatexString())
+ << from_ascii(pit->params().leftIndent().asLatexString())
<< "}\n";
texrow.newline();
leftindent_open = true;
}
if (style->isEnvironment()) {
- os << "\\begin{" << lyx::from_ascii(style->latexname()) << '}';
+ os << "\\begin{" << from_ascii(style->latexname()) << '}';
if (style->optionalargs > 0) {
int ret = latexOptArgInsets(buf, *pit, os, runparams,
style->optionalargs);
}
}
if (style->latextype == LATEX_LIST_ENVIRONMENT) {
- // FIXME UNICODE
os << '{'
- << lyx::from_utf8(pit->params().labelWidthString())
+ << pit->params().labelWidthString()
<< "}\n";
} else if (style->labeltype == LABEL_BIBLIO) {
// ale970405
os << '{' << bibitemWidest(buf) << "}\n";
} else
- os << lyx::from_ascii(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{" << lyx::from_ascii(style->latexname()) << "}\n";
+ os << "\\end{" << from_ascii(style->latexname()) << "}\n";
texrow.newline();
}
lyxerr[Debug::LATEX] << "TeXOnePar... " << &*pit << " '"
<< everypar << "'" << endl;
BufferParams const & bparams = buf.params();
- bool further_blank_line = false;
LyXLayout_ptr style;
- // In an an inset with unlimited length (all in one row),
+ // In an inset with unlimited length (all in one row),
// force layout to default
if (!pit->forceDefaultParagraphs())
style = pit->layout();
if (!lyxrc.language_command_end.empty() &&
previous_language->babel() != doc_language->babel())
{
- os << lyx::from_ascii(subst(lyxrc.language_command_end,
+ os << from_ascii(subst(lyxrc.language_command_end,
"$$lang",
previous_language->babel()))
- << endl;
+ << '\n';
texrow.newline();
}
if (lyxrc.language_command_end.empty() ||
language->babel() != doc_language->babel())
{
- os << lyx::from_ascii(subst(
+ os << from_ascii(subst(
lyxrc.language_command_begin,
"$$lang",
language->babel()))
- << endl;
+ << '\n';
texrow.newline();
}
}
- if (false) {
- if (bparams.inputenc == "auto" &&
- language->encoding() != previous_language->encoding()) {
- os << "\\inputencoding{"
- << lyx::from_ascii(language->encoding()->latexName())
- << "}\n";
- texrow.newline();
- }
+ LyXFont const outerfont =
+ outerFont(std::distance(paragraphs.begin(), pit),
+ paragraphs);
+ // This must be identical to basefont in Paragraph::simpleTeXOnePar
+ LyXFont basefont = (pit->beginOfBody() > 0) ?
+ pit->getLabelFont(bparams, outerfont) :
+ pit->getLayoutFont(bparams, outerfont);
+ Encoding const & outer_encoding(*(outerfont.language()->encoding()));
+ // FIXME we switch from the outer encoding to the encoding of
+ // this paragraph, since I could not figure out the correct
+ // logic to take the encoding of the previous paragraph into
+ // account. This may result in some unneeded encoding changes.
+ if (switchEncoding(os, bparams, outer_encoding,
+ *(basefont.language()->encoding()))) {
+ os << '\n';
+ texrow.newline();
}
- // In an an inset with unlimited length (all in one row),
+ // In an inset with unlimited length (all in one row),
// don't allow any special options in the paragraph
if (!pit->forceDefaultParagraphs()) {
if (pit->params().startOfAppendix()) {
&& (pit == paragraphs.begin()
|| !boost::prior(pit)->hasSameLayout(*pit)))
{
- os << lyx::from_ascii(pit->params().spacing().writeEnvirBegin())
+ os << from_ascii(pit->params().spacing().writeEnvirBegin())
<< '\n';
texrow.newline();
}
os << '\n';
texrow.newline();
}
-
- if (further_blank_line) {
- os << '\n';
- texrow.newline();
- }
}
switch (style->latextype) {
case LATEX_COMMAND:
- os << '\\' << lyx::from_ascii(style->latexname());
+ os << '\\' << from_ascii(style->latexname());
// Separate handling of optional argument inset.
if (style->optionalargs > 0) {
}
}
else
- os << lyx::from_ascii(style->latexparam());
+ os << from_ascii(style->latexparam());
break;
case LATEX_ITEM_ENVIRONMENT:
case LATEX_LIST_ENVIRONMENT:
}
// FIXME UNICODE
- os << lyx::from_utf8(everypar);
- bool need_par = pit->simpleTeXOnePar(buf, bparams,
- outerFont(std::distance(paragraphs.begin(), pit), paragraphs),
+ os << from_utf8(everypar);
+ bool need_par = pit->simpleTeXOnePar(buf, bparams, outerfont,
os, texrow, runparams);
// Make sure that \\par is done with the font of the last
// Is this really needed ? (Dekel)
// We do not need to use to change the font for the last paragraph
// or for a command.
- LyXFont const outerfont =
- outerFont(std::distance(paragraphs.begin(), pit),
- paragraphs);
LyXFont const font =
(pit->empty()
&& !is_command) {
if (!need_par)
os << '{';
- os << "\\" << lyx::from_ascii(font.latexSize()) << " \\par}";
+ os << "\\" << from_ascii(font.latexSize()) << " \\par}";
} else if (need_par) {
os << "\\par}";
} else if (is_command)
os << '}';
+ bool pending_newline = false;
switch (style->latextype) {
case LATEX_ITEM_ENVIRONMENT:
case LATEX_LIST_ENVIRONMENT:
if (boost::next(pit) != paragraphs.end()
- && (pit->params().depth() < boost::next(pit)->params().depth())) {
- os << '\n';
- texrow.newline();
- }
+ && (pit->params().depth() < boost::next(pit)->params().depth()))
+ pending_newline = true;
break;
case LATEX_ENVIRONMENT: {
// if its the last paragraph of the current environment
// fall through possible
default:
// we don't need it for the last paragraph!!!
- if (boost::next(pit) != paragraphs.end()) {
- os << '\n';
- texrow.newline();
- }
+ if (boost::next(pit) != paragraphs.end())
+ pending_newline = true;
}
if (!pit->forceDefaultParagraphs()) {
- further_blank_line = false;
-
- if (further_blank_line) {
- os << '\n';
- texrow.newline();
- }
-
if (!pit->params().spacing().isDefault()
&& (boost::next(pit) == paragraphs.end()
|| !boost::next(pit)->hasSameLayout(*pit)))
{
- os << lyx::from_ascii(pit->params().spacing().writeEnvirEnd())
- << '\n';
- texrow.newline();
+ if (pending_newline) {
+ os << '\n';
+ texrow.newline();
+ }
+ os << from_ascii(pit->params().spacing().writeEnvirEnd());
+ pending_newline = true;
}
}
// we need to reset the language at the end of footnote or
// float.
+ if (pending_newline) {
+ os << '\n';
+ texrow.newline();
+ }
if (lyxrc.language_command_end.empty())
- os << lyx::from_ascii(subst(
+ os << from_ascii(subst(
lyxrc.language_command_begin,
"$$lang",
- doc_language->babel()))
- << endl;
+ doc_language->babel()));
else
- os << lyx::from_ascii(subst(
+ os << from_ascii(subst(
lyxrc.language_command_end,
"$$lang",
- language->babel()))
- << endl;
+ language->babel()));
+ pending_newline = true;
+ }
+
+ // FIXME we switch from the encoding of this paragraph to the
+ // outer encoding, since I could not figure out the correct logic
+ // to take the encoding of the next paragraph into account.
+ // This may result in some unneeded encoding changes.
+ basefont = pit->getLayoutFont(bparams, outerfont);
+ switchEncoding(os, bparams, *(basefont.language()->encoding()),
+ outer_encoding);
+ if (pending_newline) {
+ os << '\n';
texrow.newline();
}
if (boost::next(pit) != paragraphs.end() &&
lyxerr.debugging(Debug::LATEX))
lyxerr << "TeXOnePar...done " << &*boost::next(pit) << endl;
+
return ++pit;
}
// 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
- // any environment other then "Standard" to be valid!
+ // any environment other than the default layout of the
+ // text class to be valid!
if (!par->forceDefaultParagraphs()) {
LyXLayout_ptr const & layout = par->layout();
was_title = true;
if (tclass.titletype() == TITLE_ENVIRONMENT) {
os << "\\begin{"
- << lyx::from_ascii(tclass.titlename())
+ << from_ascii(tclass.titlename())
<< "}\n";
texrow.newline();
}
}
} else if (was_title && !already_title) {
if (tclass.titletype() == TITLE_ENVIRONMENT) {
- os << "\\end{" << lyx::from_ascii(tclass.titlename())
+ os << "\\end{" << from_ascii(tclass.titlename())
<< "}\n";
}
else {
- os << "\\" << lyx::from_ascii(tclass.titlename())
+ os << "\\" << from_ascii(tclass.titlename())
<< "\n";
}
texrow.newline();
par = TeXOnePar(buf, paragraphs, par, os, texrow,
runparams, everypar);
} else if (layout->isEnvironment() ||
- !par->params().leftIndent().zero())
- {
+ !par->params().leftIndent().zero()) {
par = TeXEnvironment(buf, paragraphs, par, os,
texrow, runparams);
} else {
// It might be that we only have a title in this document
if (was_title && !already_title) {
if (tclass.titletype() == TITLE_ENVIRONMENT) {
- os << "\\end{" << lyx::from_ascii(tclass.titlename())
+ os << "\\end{" << from_ascii(tclass.titlename())
<< "}\n";
}
else {
- os << "\\" << lyx::from_ascii(tclass.titlename())
+ os << "\\" << from_ascii(tclass.titlename())
<< "\n";
}
texrow.newline();
}
}
+
+
+int switchEncoding(odocstream & os, BufferParams const & bparams,
+ Encoding const & oldEnc, Encoding const & newEnc)
+{
+ // FIXME thailatex does not support the inputenc package, so we
+ // ignore switches from/to tis620-0 encoding here. This does of
+ // course only work as long as the non-thai text contains ASCII
+ // only, but it is the best we can do.
+ if ((bparams.inputenc == "auto" || bparams.inputenc == "default") &&
+ oldEnc.name() != newEnc.name() &&
+ oldEnc.name() != "tis620-0" && newEnc.name() != "tis620-0") {
+ lyxerr[Debug::LATEX] << "Changing LaTeX encoding from "
+ << oldEnc.name() << " to "
+ << newEnc.name() << endl;
+ os << setEncoding(newEnc.iconvName());
+ if (bparams.inputenc != "default") {
+ docstring const inputenc(from_ascii(newEnc.latexName()));
+ os << "\\inputencoding{" << inputenc << '}';
+ return 16 + inputenc.length();
+ }
+ }
+ return 0;
+}
+
+} // namespace lyx
projects / lyx.git / blobdiff