anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Properly handle color none.

Browse Source 
Fixes: #5870
This commit is contained in:
Juergen Spitzmueller 2018-01-03 13:20:05 +01:00
parent f965d23633
commit 9a1eeb8cbb
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/Font.cpp
View File

@ -362,6 +362,8 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
FontInfo f = bits_; FontInfo f = bits_;
f.reduce(base.bits_); f.reduce(base.bits_);
FontInfo p = bits_;
p.reduce(prev.bits_);
if (f.family() != INHERIT_FAMILY) { if (f.family() != INHERIT_FAMILY) {
os << '\\' os << '\\'
@ -385,10 +387,16 @@ int Font::latexWriteStartChanges(odocstream & os, BufferParams const & bparams,
env = true; //We have opened a new environment env = true; //We have opened a new environment
} }
if (f.color() != Color_inherit && f.color() != Color_ignore) { if (f.color() != Color_inherit && f.color() != Color_ignore) {
os << "\\textcolor{" if (f.color() == Color_none && p.color() != Color_none) {
<< from_ascii(lcolor.getLaTeXName(f.color())) // Color none: Close previous color, if any
<< "}{"; os << '}';
count += lcolor.getLaTeXName(f.color()).length() + 13; ++count;
} else if (f.color() != Color_none) {
os << "\\textcolor{"
<< from_ascii(lcolor.getLaTeXName(f.color()))
<< "}{";
count += lcolor.getLaTeXName(f.color()).length() + 13;
}
env = true; //We have opened a new environment env = true; //We have opened a new environment
} }
// FIXME: uncomment this when we support background. // FIXME: uncomment this when we support background.
@ -489,7 +497,7 @@ int Font::latexWriteEndChanges(otexstream & os, BufferParams const & bparams,
++count; ++count;
env = true; // Size change need not bother about closing env. env = true; // Size change need not bother about closing env.
} }
if (f.color() != Color_inherit && f.color() != Color_ignore) { if (f.color() != Color_inherit && f.color() != Color_ignore && f.color() != Color_none) {
os << '}'; os << '}';
++count; ++count;
env = true; // Size change need not bother about closing env. env = true; // Size change need not bother about closing env.