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

cmake: more merged build fixes

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@34274 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Peter Kümmel 2010-04-23 09:10:35 +00:00
parent 4a37097d78
commit 38628558a6
4 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
development/cmake/config.h.cmake
View File

@ -78,3 +78,8 @@
#undef Status
#endif
#ifdef IN
#undef IN
#endif

1
development/cmake/src/frontends/qt4/CMakeLists.txt
View File

@ -10,6 +10,7 @@ file(GLOB frontends_qt4_sources
${TOP_SRC_DIR}/src/frontends/qt4/${LYX_CPP_FILES})
file(GLOB moc_files ${TOP_SRC_DIR}/src/frontends/qt4/${LYX_MOC_FILES})
list(REMOVE_ITEM frontends_qt4_sources ${moc_files} .)
list(REMOVE_ITEM frontends_qt4_sources ${TOP_SRC_DIR}/src/frontends/qt4/liblyxqt4.cpp)
file(GLOB frontends_qt4_headers
${TOP_SRC_DIR}/src/frontends/qt4/${LYX_HPP_FILES})

18
src/mathed/InsetMathDecoration.cpp
View File

@ -173,9 +173,9 @@ namespace {
string tag;
};
typedef map<string, Attributes> Translator;
typedef map<string, Attributes> TranslationMap;
void buildTranslator(Translator & t) {
void buildTranslationMap(TranslationMap & t) {
// the decorations we need to support are listed in lib/symbols
t["acute"] = Attributes(true, "&acute;");
t["bar"] = Attributes(true, "&OverBar;");
@ -206,18 +206,18 @@ namespace {
t["widetilde"] = Attributes(true, "&Tilde;");
}
Translator const & translator() {
static Translator t;
TranslationMap const & translationMap() {
static TranslationMap t;
if (t.empty())
buildTranslator(t);
buildTranslationMap(t);
return t;
}
}
void InsetMathDecoration::mathmlize(MathStream & os) const
{
Translator const & t = translator();
Translator::const_iterator cur = t.find(to_utf8(key_->name));
TranslationMap const & t = translationMap();
TranslationMap::const_iterator cur = t.find(to_utf8(key_->name));
LASSERT(cur != t.end(), return);
char const * const outag = cur->second.over ? "mover" : "munder";
os << MTag(outag)
@ -240,8 +240,8 @@ void InsetMathDecoration::htmlize(HtmlStream & os) const
return;
}
Translator const & t = translator();
Translator::const_iterator cur = t.find(name);
TranslationMap const & t = translationMap();
TranslationMap::const_iterator cur = t.find(name);
LASSERT(cur != t.end(), return);
bool symontop = cur->second.over;

12
src/mathed/MathFactory.cpp
View File

@ -78,7 +78,7 @@ bool has_math_fonts;
namespace {
MathWordList theWordList;
MathWordList theMathWordList;
bool isMathFontAvailable(docstring & name)
@ -208,11 +208,11 @@ void initSymbols()
<< " used for " << to_utf8(tmp.name));
}
if (theWordList.find(tmp.name) != theWordList.end())
if (theMathWordList.find(tmp.name) != theMathWordList.end())
LYXERR(Debug::MATHED, "readSymbols: inset " << to_utf8(tmp.name)
<< " already exists.");
else
theWordList[tmp.name] = tmp;
theMathWordList[tmp.name] = tmp;
LYXERR(Debug::MATHED, "read symbol '" << to_utf8(tmp.name)
<< " inset: " << to_utf8(tmp.inset)
@ -242,7 +242,7 @@ bool isSpecialChar(docstring const & name)
MathWordList const & mathedWordList()
{
return theWordList;
return theMathWordList;
}
@ -301,8 +301,8 @@ int ensureMode(WriteStream & os, InsetMath::mode_type mode,
latexkeys const * in_word_set(docstring const & str)
{
MathWordList::iterator it = theWordList.find(str);
return it != theWordList.end() ? &(it->second) : 0;
MathWordList::iterator it = theMathWordList.find(str);
return it != theMathWordList.end() ? &(it->second) : 0;
}