#include "LyXRC.h"
#include "output_latex.h"
#include "OutputParams.h"
+#include "texstream.h"
#include "support/lassert.h"
#include "support/convert.h"
tmp += "{";
os << from_ascii(tmp);
count += tmp.length();
+ pushPolyglossiaLang(language()->polyglossia(), true);
+ } else if (language()->encoding()->package() != Encoding::CJK) {
+ os << '{';
+ count += 1;
}
} else if (language()->babel() != base.language()->babel() &&
language() != prev.language()) {
"$$lang", language()->babel());
os << from_ascii(tmp);
count += tmp.length();
- } else {
+ } else if (language()->encoding()->package() != Encoding::CJK) {
os << '{';
count += 1;
}
// the numbers are written Left-to-Right. ArabTeX package
// reorders the number automatically but the packages used
// for Hebrew and Farsi (Arabi) do not.
- if (bits_.number() == FONT_ON && prev.fontInfo().number() != FONT_ON
- && (language()->lang() == "hebrew"
- || language()->lang() == "farsi"
- || language()->lang() == "arabic_arabi")) {
+ if (!runparams.pass_thru && bits_.number() == FONT_ON
+ && prev.fontInfo().number() != FONT_ON
+ && (language()->lang() == "hebrew"
+ || language()->lang() == "farsi"
+ || language()->lang() == "arabic_arabi")) {
os << "{\\beginL ";
count += 9;
}
count += 6;
env = true; //We have opened a new environment
}
+ // \noun{} is a LyX special macro
+ if (f.noun() == FONT_ON) {
+ os << "\\noun{";
+ count += 6;
+ env = true; //We have opened a new environment
+ }
+ if (f.size() != FONT_SIZE_INHERIT) {
+ // If we didn't open an environment above, we open one here
+ if (!env) {
+ os << '{';
+ ++count;
+ }
+ os << '\\'
+ << LaTeXSizeNames[f.size()]
+ << "{}";
+ count += strlen(LaTeXSizeNames[f.size()]) + 3;
+ }
+ // The ulem commands need to be on the deepest nesting level
+ // because ulem puts every nested group or macro in a box,
+ // which prevents linebreaks (#8424, #8733)
if (f.underbar() == FONT_ON) {
os << "\\uline{";
count += 10;
- runparams.inulemcmd = true;
- env = true; //We have opened a new environment
+ ++runparams.inulemcmd;
}
if (f.strikeout() == FONT_ON) {
os << "\\sout{";
count += 9;
- runparams.inulemcmd = true;
- env = true; //We have opened a new environment
+ ++runparams.inulemcmd;
}
if (f.uuline() == FONT_ON) {
os << "\\uuline{";
count += 11;
- runparams.inulemcmd = true;
- env = true; //We have opened a new environment
+ ++runparams.inulemcmd;
}
if (f.uwave() == FONT_ON) {
os << "\\uwave{";
count += 10;
- runparams.inulemcmd = true;
- env = true; //We have opened a new environment
- }
- // \noun{} is a LyX special macro
- if (f.noun() == FONT_ON) {
- os << "\\noun{";
- count += 6;
- env = true; //We have opened a new environment
- }
- if (f.size() != FONT_SIZE_INHERIT) {
- // If we didn't open an environment above, we open one here
- if (!env) {
- os << '{';
- ++count;
- }
- os << '\\'
- << LaTeXSizeNames[f.size()]
- << '{';
- count += strlen(LaTeXSizeNames[f.size()]) + 2;
+ ++runparams.inulemcmd;
}
return count;
}
++count;
env = true; // Size change need not bother about closing env.
}
- if (f.underbar() == FONT_ON) {
+ if (f.noun() == FONT_ON) {
os << '}';
++count;
- runparams.inulemcmd = false;
env = true; // Size change need not bother about closing env.
}
- if (f.strikeout() == FONT_ON) {
- os << '}';
- ++count;
- runparams.inulemcmd = false;
- env = true; // Size change need not bother about closing env.
+ if (f.size() != FONT_SIZE_INHERIT) {
+ // We only have to close if only size changed
+ if (!env) {
+ os << '}';
+ ++count;
+ }
}
- if (f.uuline() == FONT_ON) {
+ if (f.underbar() == FONT_ON) {
os << '}';
++count;
- runparams.inulemcmd = false;
- env = true; // Size change need not bother about closing env.
+ --runparams.inulemcmd;
}
- if (f.uwave() == FONT_ON) {
+ if (f.strikeout() == FONT_ON) {
os << '}';
++count;
- runparams.inulemcmd = false;
- env = true; // Size change need not bother about closing env.
+ --runparams.inulemcmd;
}
- if (f.noun() == FONT_ON) {
+ if (f.uuline() == FONT_ON) {
os << '}';
++count;
- env = true; // Size change need not bother about closing env.
+ --runparams.inulemcmd;
}
- if (f.size() != FONT_SIZE_INHERIT) {
- // We only have to close if only size changed
- if (!env) {
- os << '}';
- ++count;
- }
+ if (f.uwave() == FONT_ON) {
os << '}';
++count;
+ --runparams.inulemcmd;
}
- // When the current language is Hebrew, Arabic, or Farsi
+ // If the current language is Hebrew, Arabic, or Farsi
// the numbers are written Left-to-Right. ArabTeX package
// reorders the number automatically but the packages used
// for Hebrew and Farsi (Arabi) do not.
- if (bits_.number() == FONT_ON && next.fontInfo().number() != FONT_ON
- && (language()->lang() == "hebrew"
- || language()->lang() == "farsi"
- || language()->lang() == "arabic_arabi")) {
+ if (!runparams.pass_thru && bits_.number() == FONT_ON
+ && next.fontInfo().number() != FONT_ON
+ && (language()->lang() == "hebrew"
+ || language()->lang() == "farsi"
+ || language()->lang() == "arabic_arabi")) {
os << "\\endL}";
count += 6;
}
&& language()->encoding()->package() != Encoding::CJK) {
os << '}';
++count;
+ if (runparams.use_polyglossia)
+ popPolyglossiaLang();
}
return count;
case Color_latex:
case Color_notelabel:
break;
+ case Color_brown:
+ case Color_darkgray:
+ case Color_gray:
+ case Color_lightgray:
+ case Color_lime:
+ case Color_olive:
+ case Color_orange:
+ case Color_pink:
+ case Color_purple:
+ case Color_teal:
+ case Color_violet:
+ features.require("xcolor");
+ break;
default:
features.require("color");
LYXERR(Debug::LATEX, "Color enabled. Font: " << to_utf8(stateText(0)));
// FIXME: Do something for background and soul package?
if (((features.usePolyglossia() && lang_->polyglossia() != doc_language->polyglossia())
- || (features.useBabel() && lang_->babel() != doc_language->babel()))
+ || (features.useBabel() && lang_->babel() != doc_language->babel())
+ || (doc_language->encoding()->package() == Encoding::CJK && lang_ != doc_language))
&& lang_ != ignore_language
&& lang_ != latex_language)
{
projects / lyx.git / blobdiff