X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FChanges.cpp;h=33209afbbb58b22c4e13d3fdd30c9d9eff9c4475;hb=b4e609bd691b326756e802bb16524bb837b5a10e;hp=dfe04cd306b7d949cc0d7c98e43f99907825687f;hpb=fba1c434e5166d0bd44fc7b981a141ab94553d5d;p=features.git diff --git a/src/Changes.cpp b/src/Changes.cpp index dfe04cd306..33209afbbb 100644 --- a/src/Changes.cpp +++ b/src/Changes.cpp @@ -17,6 +17,7 @@ #include "Author.h" #include "Buffer.h" #include "BufferParams.h" +#include "Color.h" #include "Encoding.h" #include "LyXRC.h" #include "MetricsInfo.h" @@ -429,7 +430,7 @@ int Changes::latexMarkChange(otexstream & os, BufferParams const & bparams, int column = 0; if (oldChange.type != Change::UNCHANGED) { - if (oldChange.type != Change::DELETED || runparams.ctObject != OutputParams::CT_OMITOBJECT) { + if (oldChange.type != Change::DELETED || runparams.ctObject != CtObject::OmitObject) { // close \lyxadded or \lyxdeleted os << '}'; column++; @@ -446,13 +447,13 @@ int Changes::latexMarkChange(otexstream & os, BufferParams const & bparams, docstring macro_beg; if (change.type == Change::DELETED) { - if (runparams.ctObject == OutputParams::CT_OMITOBJECT) + if (runparams.ctObject == CtObject::OmitObject) return 0; - else if (runparams.ctObject == OutputParams::CT_OBJECT) + else if (runparams.ctObject == CtObject::Object) macro_beg = from_ascii("\\lyxobjdeleted"); - else if (runparams.ctObject == OutputParams::CT_DISPLAYOBJECT) + else if (runparams.ctObject == CtObject::DisplayObject) macro_beg = from_ascii("\\lyxdisplayobjdeleted"); - else if (runparams.ctObject == OutputParams::CT_UDISPLAYOBJECT) + else if (runparams.ctObject == CtObject::UDisplayObject) macro_beg = from_ascii("\\lyxudisplayobjdeleted"); else { macro_beg = from_ascii("\\lyxdeleted");