#include "Paragraph.h"
#include "ParagraphParameters.h"
#include "TextClass.h"
-#include "TexRow.h"
#include "insets/InsetBibitem.h"
#include "insets/InsetArgument.h"
#include "support/convert.h"
#include "support/debug.h"
#include "support/lstrings.h"
+#include "support/lyxalgo.h"
#include "support/textutils.h"
-#include <algorithm>
-#include <boost/next_prior.hpp>
+#include <QThreadStorage>
+
#include <list>
using namespace std;
CJK
};
-// FIXME THREAD
-// There could easily be a conflict here, with the export process
-// setting this one way, and a View>Source process (possbily for
-// another Buffer) resetting it.
-static int open_encoding_ = none;
-static int cjk_inherited_ = 0;
-Language const * prev_env_language_ = 0;
+
+struct OutputState
+{
+ OutputState() : open_encoding_(none), cjk_inherited_(0),
+ prev_env_language_(0), open_polyglossia_lang_("")
+ {
+ }
+ OpenEncoding open_encoding_;
+ int cjk_inherited_;
+ Language const * prev_env_language_;
+ string open_polyglossia_lang_;
+};
+
+
+OutputState * getOutputState()
+{
+ // FIXME An instance of OutputState should be kept around for each export
+ // instead of using local thread storage
+ static QThreadStorage<OutputState *> outputstate;
+ if (!outputstate.hasLocalData())
+ outputstate.setLocalData(new OutputState);
+ return outputstate.localData();
+}
string const getPolyglossiaEnvName(Language const * lang)
}
+string const getPolyglossiaBegin(string const & lang_begin_command,
+ string const & lang, string const & opts)
+{
+ string result;
+ if (!lang.empty())
+ result = subst(lang_begin_command, "$$lang", lang);
+ string options = opts.empty() ?
+ string() : "[" + opts + "]";
+ result = subst(result, "$$opts", options);
+
+ return result;
+}
+
+
struct TeXEnvironmentData
{
bool cjk_nested;
ParagraphList const & paragraphs = text.paragraphs();
ParagraphList::const_iterator const priorpit =
- pit == paragraphs.begin() ? pit : boost::prior(pit);
+ pit == paragraphs.begin() ? pit : prev(pit, 1);
- bool const use_prev_env_language = prev_env_language_ != 0
+ OutputState * state = getOutputState();
+ bool const use_prev_env_language = state->prev_env_language_ != 0
&& priorpit->layout().isEnvironment()
&& (priorpit->getDepth() > pit->getDepth()
|| (priorpit->getDepth() == pit->getDepth()
Language const * const doc_language = bparams.language;
Language const * const prev_par_language =
(pit != paragraphs.begin())
- ? (use_prev_env_language ? prev_env_language_
+ ? (use_prev_env_language ? state->prev_env_language_
: priorpit->getParLanguage(bparams))
: doc_language;
if ((lang_end_command.empty() ||
par_lang != doc_lang) &&
!par_lang.empty()) {
- os << from_ascii(subst(
- lang_begin_command,
- "$$lang",
- par_lang));
- if (use_polyglossia
- && !data.par_language->polyglossiaOpts().empty())
- os << "["
- << from_ascii(data.par_language->polyglossiaOpts())
- << "]";
- // the '%' is necessary to prevent unwanted whitespace
- os << "%\n";
+ string bc = use_polyglossia ?
+ getPolyglossiaBegin(lang_begin_command, par_lang,
+ data.par_language->polyglossiaOpts())
+ : subst(lang_begin_command, "$$lang", par_lang);
+ os << bc;
+ // the '%' is necessary to prevent unwanted whitespace
+ os << "%\n";
}
}
}
if (style.isEnvironment()) {
+ if (par_lang != doc_lang)
+ state->open_polyglossia_lang_ = par_lang;
os << "\\begin{" << from_ascii(style.latexname()) << '}';
if (!style.latexargs().empty()) {
OutputParams rp = runparams;
// in multilingual environments, the CJK tags have to be nested properly
data.cjk_nested = false;
if (data.par_language->encoding()->package() == Encoding::CJK &&
- open_encoding_ != CJK && pit->isMultiLingual(bparams)) {
+ state->open_encoding_ != CJK && pit->isMultiLingual(bparams)) {
if (prev_par_language->encoding()->package() == Encoding::CJK)
os << "\\begin{CJK}{" << from_ascii(data.par_language->encoding()->latexName())
<< "}{" << from_ascii(bparams.fonts_cjk) << "}%\n";
- open_encoding_ = CJK;
+ state->open_encoding_ = CJK;
data.cjk_nested = true;
}
return data;
}
-static void finishEnvironment(Buffer const & buf, Text const & text,
- pit_type nextpit, otexstream & os,
- OutputParams const & runparams,
+static void finishEnvironment(otexstream & os, OutputParams const & runparams,
TeXEnvironmentData const & data)
{
- if (open_encoding_ == CJK && data.cjk_nested) {
+ OutputState * state = getOutputState();
+ // BufferParams const & bparams = buf.params(); // FIXME: for speedup shortcut below, would require passing of "buf" as argument
+ if (state->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";
- open_encoding_ = none;
+ state->open_encoding_ = none;
}
if (data.style->isEnvironment()) {
os << breakln
<< "\\end{" << from_ascii(data.style->latexname()) << "}\n";
- prev_env_language_ = data.par_language;
+ state->prev_env_language_ = data.par_language;
if (runparams.encoding != data.prev_encoding) {
runparams.encoding = data.prev_encoding;
- if (!runparams.isFullUnicode())
- os << setEncoding(data.prev_encoding->iconvName());
+ os << setEncoding(data.prev_encoding->iconvName());
}
}
if (data.leftindent_open) {
os << breakln << "\\end{LyXParagraphLeftIndent}\n";
- prev_env_language_ = data.par_language;
+ state->prev_env_language_ = data.par_language;
if (runparams.encoding != data.prev_encoding) {
runparams.encoding = data.prev_encoding;
- if (!runparams.isFullUnicode())
- os << setEncoding(data.prev_encoding->iconvName());
+ os << setEncoding(data.prev_encoding->iconvName());
}
}
// Check whether we should output a blank line after the environment
- DocumentClass const & tclass = buf.params().documentClass();
- ParagraphList const & pars = text.paragraphs();
- bool next_style_is_default = (nextpit >= runparams.par_end) ? false
- : tclass.isDefaultLayout(pars.constIterator(nextpit)->layout());
- if (!data.style->nextnoindent && next_style_is_default)
+ if (!data.style->nextnoindent)
os << '\n';
}
prepareEnvironment(buf, text, par, os, runparams);
// Recursive call to TeXEnvironment!
TeXEnvironment(buf, text, runparams, pit, os);
- finishEnvironment(buf, text, pit + 1, os, runparams, data);
+ finishEnvironment(os, runparams, data);
}
if (pit != runparams.par_end)
// get the first paragraph in sequence with this layout and depth
pit_type offset = 0;
while (true) {
- if (boost::prior(pit, offset) == pars.begin())
+ if (lyx::prev(pit, offset) == pars.begin())
break;
- ParagraphList::const_iterator priorpit = boost::prior(pit, offset + 1);
+ ParagraphList::const_iterator priorpit = lyx::prev(pit, offset + 1);
if (priorpit->layout() == current_layout
&& priorpit->params().depth() == current_depth)
++offset;
break;
}
- ParagraphList::const_iterator spit = boost::prior(pit, offset);
+ ParagraphList::const_iterator spit = lyx::prev(pit, offset);
for (; spit != pars.end(); ++spit) {
if (spit->layout() != current_layout || spit->params().depth() < current_depth)
Paragraph const & par = paragraphs.at(pit);
// FIXME This check should not really be needed.
// Perhaps we should issue an error if it is.
- Layout const style = text.inset().forcePlainLayout() ?
+ Layout const & style = text.inset().forcePlainLayout() ?
bparams.documentClass().plainLayout() : par.layout();
if (style.inpreamble)
bool const maintext = text.isMainText();
// we are at the beginning of an inset and CJK is already open;
// we count inheritation levels to get the inset nesting right.
+ OutputState * state = getOutputState();
if (pit == 0 && !maintext
- && (cjk_inherited_ > 0 || open_encoding_ == CJK)) {
- cjk_inherited_ += 1;
- open_encoding_ = none;
+ && (state->cjk_inherited_ > 0 || state->open_encoding_ == CJK)) {
+ state->cjk_inherited_ += 1;
+ state->open_encoding_ = none;
}
if (text.inset().isPassThru()) {
// This paragraph's language
Language const * const par_language = par.getParLanguage(bparams);
+ Language const * const nextpar_language = nextpar ?
+ nextpar->getParLanguage(bparams) : 0;
// The document's language
Language const * const doc_language = bparams.language;
// The language that was in effect when the environment this paragraph is
// environment with nesting depth greater than (or equal to, but with
// a different layout) the current one. If there is no previous
// paragraph, the previous language is the outer language.
- bool const use_prev_env_language = prev_env_language_ != 0
+ bool const use_prev_env_language = state->prev_env_language_ != 0
&& priorpar
&& priorpar->layout().isEnvironment()
&& (priorpar->getDepth() > par.getDepth()
&& priorpar->layout() != par.layout()));
Language const * const prev_language =
(pit != 0)
- ? (use_prev_env_language ? prev_env_language_
+ ? (use_prev_env_language ? state->prev_env_language_
: priorpar->getParLanguage(bparams))
: outer_language;
getPolyglossiaEnvName(par_language): par_language->babel();
string const prev_lang = use_polyglossia ?
getPolyglossiaEnvName(prev_language) : prev_language->babel();
- string const doc_lang = use_polyglossia ?
- getPolyglossiaEnvName(doc_language) : doc_language->babel();
string const outer_lang = use_polyglossia ?
getPolyglossiaEnvName(outer_language) : outer_language->babel();
+ string const nextpar_lang = nextpar_language ? (use_polyglossia ?
+ getPolyglossiaEnvName(nextpar_language) :
+ nextpar_language->babel()) : string();
string lang_begin_command = use_polyglossia ?
- "\\begin{$$lang}" : lyxrc.language_command_begin;
+ "\\begin{$$lang}$$opts" : lyxrc.language_command_begin;
string lang_end_command = use_polyglossia ?
"\\end{$$lang}" : lyxrc.language_command_end;
// the '%' is necessary to prevent unwanted whitespace
string lang_command_termination = "%\n";
// In some insets (such as Arguments), we cannot use \selectlanguage
- bool const localswitch = !use_polyglossia
- && text.inset().getLayout().forcelocalfontswitch();
+ bool const localswitch = text.inset().forceLocalFontSwitch();
if (localswitch) {
- lang_begin_command = lyxrc.language_command_local;
+ lang_begin_command = use_polyglossia ?
+ "\\text$$lang$$opts{" : lyxrc.language_command_local;
lang_end_command = "}";
lang_command_termination.clear();
}
"$$lang",
prev_lang))
<< lang_command_termination;
+ if (prev_lang == state->open_polyglossia_lang_)
+ state->open_polyglossia_lang_ = "";
}
// We need to open a new language if we couldn't close the previous
// With CJK, the CJK tag has to be closed first (see below)
if (runparams.encoding->package() != Encoding::CJK
&& !par_lang.empty()) {
- os << from_ascii(subst(
- lang_begin_command,
- "$$lang",
- par_lang));
- if (use_polyglossia
- && !par_language->polyglossiaOpts().empty())
- os << "["
- << from_ascii(par_language->polyglossiaOpts())
- << "]";
+ string bc = use_polyglossia ?
+ getPolyglossiaBegin(lang_begin_command, par_lang, par_language->polyglossiaOpts())
+ : subst(lang_begin_command, "$$lang", par_lang);
+ os << bc;
os << lang_command_termination;
}
}
// encoding, since this only affects the position of the outputted
// \inputencoding command; the encoding switch will occur when necessary
if (bparams.inputenc == "auto"
+ && !runparams.isFullUnicode() // Xe/LuaTeX use one document-wide encoding (see also switchEncoding())
&& runparams.encoding->package() != Encoding::none) {
// Look ahead for future encoding changes.
// We try to output them at the beginning of the paragraph,
// the following is necessary after a CJK environment in a multilingual
// context (nesting issue).
if (par_language->encoding()->package() == Encoding::CJK
- && open_encoding_ != CJK && cjk_inherited_ == 0) {
+ && state->open_encoding_ != CJK && state->cjk_inherited_ == 0) {
os << "\\begin{CJK}{" << from_ascii(par_language->encoding()->latexName())
<< "}{" << from_ascii(bparams.fonts_cjk) << "}%\n";
- open_encoding_ = CJK;
+ state->open_encoding_ = CJK;
}
if (encoding->package() != Encoding::none && enc_switch.first) {
if (enc_switch.second > 0) {
// calculates the space between the baselines according
// to this font. (Matthias)
//
- // Is this really needed ? (Dekel)
- // We do not need to use to change the font for the last paragraph
- // or for a command.
+ // We must not change the font for the last paragraph
+ // of non-multipar insets, tabular cells or commands,
+ // since this produces unwanted whitespace.
Font const font = par.empty()
? par.getLayoutFont(bparams, outerfont)
bool const is_command = style.isCommand();
if (style.resfont.size() != font.fontInfo().size()
- && nextpar
+ && (nextpar || maintext
+ || (text.inset().paragraphs().size() > 1
+ && text.inset().lyxCode() != CELL_CODE))
&& !is_command) {
os << '{';
os << "\\" << from_ascii(font.latexSize()) << " \\par}";
latexArgInsets(par, os, runparams, style.postcommandargs(), "post:");
if (runparams.encoding != prev_encoding) {
runparams.encoding = prev_encoding;
- if (!runparams.isFullUnicode())
- os << setEncoding(prev_encoding->iconvName());
+ os << setEncoding(prev_encoding->iconvName());
}
}
&& runparams.local_font != 0
&& runparams.local_font->isRightToLeft() != par_language->rightToLeft()
// are we about to close the language?
- &&((nextpar && par_language->babel() != (nextpar->getParLanguage(bparams))->babel())
- || (runparams.isLastPar && par_language->babel() != outer_language->babel()));
+ &&((nextpar && par_lang != nextpar_lang)
+ || (runparams.isLastPar && par_lang != outer_lang));
if (closing_rtl_ltr_environment
|| (runparams.isLastPar
- && ((!use_polyglossia && par_language->babel() != outer_language->babel())
- || (use_polyglossia && par_language->polyglossia() != outer_language->polyglossia())))) {
+ && par_lang != outer_lang)) {
// Since \selectlanguage write the language to the aux file,
// we need to reset the language at the end of footnote or
// float.
? getPolyglossiaEnvName(current_language)
: current_language->babel();
if (!current_lang.empty()) {
+ string bc = use_polyglossia ?
+ getPolyglossiaBegin(lang_begin_command, current_lang,
+ current_language->polyglossiaOpts())
+ : subst(lang_begin_command, "$$lang", current_lang);
+ os << bc;
+ pending_newline = !localswitch;
+ unskip_newline = !localswitch;
+ }
+ } else if (!par_lang.empty()) {
+ // If we are in an environment, we have to close the "outer" language afterwards
+ if (!style.isEnvironment() || state->open_polyglossia_lang_ != par_lang) {
os << from_ascii(subst(
- lang_begin_command,
+ lang_end_command,
"$$lang",
- current_lang));
+ par_lang));
pending_newline = !localswitch;
unskip_newline = !localswitch;
}
- } else if (!par_lang.empty()) {
- os << from_ascii(subst(
- lang_end_command,
- "$$lang",
- par_lang));
- pending_newline = !localswitch;
- unskip_newline = !localswitch;
}
}
}
// if this is a CJK-paragraph and the next isn't, close CJK
// also if the next paragraph is a multilingual environment (because of nesting)
if (nextpar
- && open_encoding_ == CJK
- && (nextpar->getParLanguage(bparams)->encoding()->package() != Encoding::CJK
+ && state->open_encoding_ == CJK
+ && (nextpar_language->encoding()->package() != Encoding::CJK
|| (nextpar->layout().isEnvironment() && nextpar->isMultiLingual(bparams)))
// inbetween environments, CJK has to be closed later (nesting!)
&& (!style.isEnvironment() || !nextpar->layout().isEnvironment())) {
os << "\\end{CJK}\n";
- open_encoding_ = none;
+ state->open_encoding_ = none;
}
// If this is the last paragraph, close the CJK environment
// if necessary. If it's an environment, we'll have to \end that first.
if (runparams.isLastPar && !style.isEnvironment()) {
- switch (open_encoding_) {
+ switch (state->open_encoding_) {
case CJK: {
// do nothing at the end of child documents
if (maintext && buf.masterBuffer() != &buf)
// end of an inset
} else
os << "\\end{CJK}";
- open_encoding_ = none;
+ state->open_encoding_ = none;
break;
}
case inputenc: {
os << "\\egroup";
- open_encoding_ = none;
+ state->open_encoding_ = none;
break;
}
case none:
}
// If this is the last paragraph, and a local_font was set upon entering
- // the inset, and we're using "auto" or "default" encoding, the encoding
+ // the inset, and we're using "auto" or "default" encoding, and not
+ // compiling with XeTeX or LuaTeX, the encoding
// should be set back to that local_font's encoding.
- // However, do not change the encoding when a fully unicode aware backend
- // such as XeTeX is used.
if (runparams.isLastPar && runparams_in.local_font != 0
&& runparams_in.encoding != runparams_in.local_font->language()->encoding()
&& (bparams.inputenc == "auto" || bparams.inputenc == "default")
- && (!runparams.isFullUnicode())) {
+ && !runparams.isFullUnicode()
+ ) {
runparams_in.encoding = runparams_in.local_font->language()->encoding();
os << setEncoding(runparams_in.encoding->iconvName());
}
// unchanged, or (case 2) the following is a
// non-environment paragraph whose depth is increased
// but whose alignment is unchanged, or (case 3) the
+ // paragraph is not an environment and the next one is a
+ // non-itemize-like env at lower depth, or (case 4) the
// paragraph is a command not followed by an environment
// and the alignment of the current and next paragraph
- // is unchanged, or (case 4) the current alignment is
+ // is unchanged, or (case 5) the current alignment is
// changed and a standard paragraph follows.
DocumentClass const & tclass = bparams.documentClass();
if ((style == next_layout
&& !style.parbreak_is_newline
+ && !text.inset().getLayout().parbreakIsNewline()
&& style.latextype != LATEX_ITEM_ENVIRONMENT
&& style.latextype != LATEX_LIST_ENVIRONMENT
&& style.align == par.getAlign()
|| (!next_layout.isEnvironment()
&& nextpar->getDepth() > par.getDepth()
&& nextpar->getAlign() == par.getAlign())
+ || (!style.isEnvironment()
+ && next_layout.latextype == LATEX_ENVIRONMENT
+ && nextpar->getDepth() < par.getDepth())
|| (style.isCommand()
&& !next_layout.isEnvironment()
&& style.align == par.getAlign()
// Open a CJK environment at the beginning of the main buffer
// if the document's language is a CJK language
// (but not in child documents)
+ OutputState * state = getOutputState();
if (maintext && !is_child
&& bparams.encoding().package() == Encoding::CJK) {
os << "\\begin{CJK}{" << from_ascii(bparams.encoding().latexName())
<< "}{" << from_ascii(bparams.fonts_cjk) << "}%\n";
- open_encoding_ = CJK;
+ state->open_encoding_ = CJK;
}
// if "auto begin" is switched off, explicitly switch the
// language on at start
? getPolyglossiaEnvName(bparams.language)
: bparams.language->babel();
string const lang_begin_command = runparams.use_polyglossia ?
- "\\begin{$$lang}" : lyxrc.language_command_begin;
+ "\\begin{$$lang}$$opts" : lyxrc.language_command_begin;
if (maintext && !lyxrc.language_auto_begin &&
!mainlang.empty()) {
// FIXME UNICODE
- os << from_utf8(subst(lang_begin_command,
- "$$lang",
- mainlang));
- if (runparams.use_polyglossia
- && !bparams.language->polyglossiaOpts().empty())
- os << "["
- << from_ascii(bparams.language->polyglossiaOpts())
- << "]";
+ string bc = runparams.use_polyglossia ?
+ getPolyglossiaBegin(lang_begin_command, mainlang,
+ bparams.language->polyglossiaOpts())
+ : subst(lang_begin_command, "$$lang", mainlang);
+ os << bc;
os << '\n';
}
prepareEnvironment(buf, text, par, os, runparams);
// pit can be changed in TeXEnvironment.
TeXEnvironment(buf, text, runparams, pit, os);
- finishEnvironment(buf, text, pit + 1, os, runparams, data);
+ finishEnvironment(os, runparams, data);
}
if (pit == runparams.par_end) {
}
// if "auto end" is switched off, explicitly close the language at the end
- // but only if the last par is in a babel language
+ // but only if the last par is in a babel or polyglossia language
string const lang_end_command = runparams.use_polyglossia ?
"\\end{$$lang}" : lyxrc.language_command_end;
if (maintext && !lyxrc.language_auto_end && !mainlang.empty() &&
"$$lang",
mainlang))
<< '\n';
+ if (state->open_polyglossia_lang_ == mainlang)
+ state->open_polyglossia_lang_ = "";
}
// 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) {
+ if (maintext && !is_child && state->open_encoding_ == CJK) {
os << "\\end{CJK}\n";
- open_encoding_ = none;
+ state->open_encoding_ = none;
+ }
+ // Likewise for polyglossia
+ if (maintext && !is_child && state->open_polyglossia_lang_ != "") {
+ os << from_utf8(subst(lang_end_command,
+ "$$lang",
+ state->open_polyglossia_lang_))
+ << '\n';
+ state->open_polyglossia_lang_ = "";
}
// reset inherited encoding
- if (cjk_inherited_ > 0) {
- cjk_inherited_ -= 1;
- if (cjk_inherited_ == 0)
- open_encoding_ = CJK;
+ if (state->cjk_inherited_ > 0) {
+ state->cjk_inherited_ -= 1;
+ if (state->cjk_inherited_ == 0)
+ state->open_encoding_ = CJK;
}
}
OutputParams const & runparams, Encoding const & newEnc,
bool force)
{
+ // XeTeX/LuaTeX use only one encoding per document:
+ // * with useNonTeXFonts: "utf8plain",
+ // * with XeTeX and TeX fonts: "ascii" (inputenc fails),
+ // * with LuaTeX and TeX fonts: only one encoding accepted by luainputenc.
+ if (runparams.isFullUnicode())
+ return make_pair(false, 0);
+
Encoding const & oldEnc = *runparams.encoding;
bool moving_arg = runparams.moving_arg;
// If we switch from/to CJK, we need to switch anyway, despite custom inputenc
return make_pair(true, 0);
docstring const inputenc_arg(from_ascii(newEnc.latexName()));
+ OutputState * state = getOutputState();
switch (newEnc.package()) {
case Encoding::none:
case Encoding::japanese:
case Encoding::inputenc: {
int count = inputenc_arg.length();
if (oldEnc.package() == Encoding::CJK &&
- open_encoding_ == CJK) {
+ state->open_encoding_ == CJK) {
os << "\\end{CJK}";
- open_encoding_ = none;
+ state->open_encoding_ = none;
count += 9;
}
else if (oldEnc.package() == Encoding::inputenc &&
- open_encoding_ == inputenc) {
+ state->open_encoding_ == inputenc) {
os << "\\egroup";
- open_encoding_ = none;
+ state->open_encoding_ = none;
count += 7;
}
if (runparams.local_font != 0
// else CJK fails.
os << "\\bgroup";
count += 7;
- open_encoding_ = inputenc;
+ state->open_encoding_ = inputenc;
}
// with the japanese option, inputenc is omitted.
if (runparams.use_japanese)
case Encoding::CJK: {
int count = inputenc_arg.length();
if (oldEnc.package() == Encoding::CJK &&
- open_encoding_ == CJK) {
+ state->open_encoding_ == CJK) {
os << "\\end{CJK}";
count += 9;
}
if (oldEnc.package() == Encoding::inputenc &&
- open_encoding_ == inputenc) {
+ state->open_encoding_ == inputenc) {
os << "\\egroup";
count += 7;
}
os << "\\begin{CJK}{" << inputenc_arg << "}{"
<< from_ascii(bparams.fonts_cjk) << "}";
- open_encoding_ = CJK;
+ state->open_encoding_ = CJK;
return make_pair(true, count + 15);
}
}
projects / lyx.git / blobdiff