Natbib authoryear uses (Ref1; Ref2) by default.

[lyx.git] / src / WordList.cpp

diff --git a/src/WordList.cpp b/src/WordList.cpp
index e95514ab0bc444fcf31aaa7b90789fc913040646..762e1b93c620411af87688dea91cbe0267eb2612 100644 (file)
--- a/src/WordList.cpp
+++ b/src/WordList.cpp
@@ -12,23 +12,45 @@
 
 #include "WordList.h"
 
+#include "Language.h"
+
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/docstring.h"
 #include "support/weighted_btree.h"
 
-#include "support/assert.h"
+#include "support/lassert.h"
+
+#include <map>
+
+using namespace std;
 
 namespace lyx {
 
 ///
-WordList theGlobalWordList;
+map<Language, WordList *> theGlobalWordList;
 
-WordList & theWordList()
+
+WordList * theWordList(Language const & lang)
 {
-       return theGlobalWordList;
+       map<Language, WordList *>::iterator it = theGlobalWordList.find(lang);
+       if (it != theGlobalWordList.end())
+               return it->second;
+       else
+               theGlobalWordList[lang] = new WordList;
+       return theGlobalWordList[lang];
 }
 
+
+void WordList::cleanupWordLists()
+{
+       map<Language, WordList *>::const_iterator it = theGlobalWordList.begin();
+       for (; it != theGlobalWordList.end(); ++it)
+               delete it->second;
+       theGlobalWordList.clear();
+}
+
+
 ///
 struct WordList::Impl {
        ///
@@ -62,7 +84,7 @@ WordList::~WordList()
 docstring const & WordList::word(size_t idx) const
 {
        Impl::Words::const_iterator it = d->words_.find_summed_weight(idx);
-       LASSERT(it != d->words_.end(), /**/);
+       LASSERT(it != d->words_.end(), { static docstring dummy; return dummy; });
        
        // We use the key() method here, and not something like it->first
        // because the btree only returns (iterator-) temporary value pairs.