anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-14 15:05:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Do not load font packages with encoding "utf8-plain" (bug #7766, #7782).

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@40637 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2012-01-20 13:02:19 +00:00
parent 4ebcd17969
commit 25746dc622
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Encoding.cpp
View File

@ -577,11 +577,14 @@ void Encodings::validate(char_type c, LaTeXFeatures & features, bool for_mathed)
CharInfoMap::const_iterator const it = unicodesymbols.find(c); CharInfoMap::const_iterator const it = unicodesymbols.find(c);
if (it != unicodesymbols.end()) { if (it != unicodesymbols.end()) {
// In mathed, c could be used both in textmode and mathmode // In mathed, c could be used both in textmode and mathmode
bool const use_math = (for_mathed && isMathCmd(c)) || bool const math_mode = for_mathed && isMathCmd(c);
bool const use_math = math_mode ||
(!for_mathed && it->second.textcommand.empty()); (!for_mathed && it->second.textcommand.empty());
bool const use_text = (for_mathed && isTextCmd(c)) || bool const use_text = (for_mathed && isTextCmd(c)) ||
(!for_mathed && !it->second.textcommand.empty()); (!for_mathed && !it->second.textcommand.empty());
if (use_math) { bool const plain_utf8 = (features.runparams().encoding->name() == "utf8-plain");
// with utf8-plain, we only load packages when in mathed (see #7766)
if (math_mode || (use_math && !plain_utf8)) {
if (!it->second.mathpreamble.empty()) { if (!it->second.mathpreamble.empty()) {
if (it->second.mathfeature) { if (it->second.mathfeature) {
string feats = it->second.mathpreamble; string feats = it->second.mathpreamble;
@ -594,7 +597,8 @@ void Encodings::validate(char_type c, LaTeXFeatures & features, bool for_mathed)
features.addPreambleSnippet(it->second.mathpreamble); features.addPreambleSnippet(it->second.mathpreamble);
} }
} }
if (use_text) { // with utf8-plain, we do not load packages (see #7766)
if (use_text && !plain_utf8) {
if (!it->second.textpreamble.empty()) { if (!it->second.textpreamble.empty()) {
if (it->second.textfeature) { if (it->second.textfeature) {
string feats = it->second.textpreamble; string feats = it->second.textpreamble;

4
status.20x
View File

@ -41,6 +41,7 @@ What's new
- Allow redirecting stderr in converters (other than stdout). - Allow redirecting stderr in converters (other than stdout).
* TEX2LYX IMPROVEMENTS * TEX2LYX IMPROVEMENTS
- Support for included external files via the templates - Support for included external files via the templates
@ -144,6 +145,9 @@ What's new
- Do not misdetect office file formats as zip (bug 7973). - Do not misdetect office file formats as zip (bug 7973).
- Fix font/script definition clashes with XeTeX/LuaTeX and unicode output
(bug 7766, 7782).
* TEX2LYX * TEX2LYX