Disentangle moduleCanBeAdded for ordinary layout modules and the

new (but not yet functioning, it seems) citation modules. This
fixes a bug reported on the list:
  http://marc.info/?l=lyx-users&m=135456590710371&w=2

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 404c9a2caccddf04ff5749c00b9d11bf530bff5f..e672525ce87f2a5668777053dd30f8c1703fc66d 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -2084,10 +2084,15 @@ void BufferParams::makeDocumentClass()
 }
 
 
-bool BufferParams::moduleCanBeAdded(string const & modName) const
+bool BufferParams::layoutModuleCanBeAdded(string const & modName) const
 {
-       return cite_engine_.moduleCanBeAdded(modName, baseClass()) &&
-               layout_modules_.moduleCanBeAdded(modName, baseClass());
+       return layout_modules_.moduleCanBeAdded(modName, baseClass());
+}
+
+
+bool BufferParams::citationModuleCanBeAdded(string const & modName) const
+{
+       return cite_engine_.moduleCanBeAdded(modName, baseClass());
 }
 
 

diff --git a/src/BufferParams.h b/src/BufferParams.h
index 98f79a57fbee105397adff1ff5a28a5a57d3d849..80025abff1550b1d9d73d170bc3d1f450e5c78ff 100644 (file)
--- a/src/BufferParams.h
+++ b/src/BufferParams.h
@@ -146,13 +146,15 @@ public:
                        { return removed_modules_; }
        ///
        /// Add a module to the list of modules in use. This checks only that the
-       /// module is not already in the list, so use moduleIsCompatible first if
-       /// you want to check for compatibility.
+       /// module is not already in the list, so use layoutModuleCanBeAdeed first 
+       /// if you want to check for compatibility.
        /// \return true if module was successfully added.
        bool addLayoutModule(std::string const & modName);
        /// checks to make sure module's requriements are satisfied, that it does
        /// not conflict with already-present modules, isn't already loaded, etc.
-       bool moduleCanBeAdded(std::string const & modName) const;
+       bool layoutModuleCanBeAdded(std::string const & modName) const;
+       /// same, but for citaton modules.
+       bool citationModuleCanBeAdded(std::string const & modName) const;
        ///
        void addRemovedModule(std::string const & modName)
                        { removed_modules_.push_back(modName); }

diff --git a/src/BufferView.cpp b/src/BufferView.cpp
index 31c95cf764e0803ebe061c6e840bb37c6226e35e..fd26a81709b5cfe3b4cfeb81f7ba7ba0e2ee9798 100644 (file)
--- a/src/BufferView.cpp
+++ b/src/BufferView.cpp
@@ -1274,7 +1274,7 @@ void BufferView::dispatch(FuncRequest const & cmd, DispatchResult & dr)
 
        case LFUN_LAYOUT_MODULE_ADD: {
                BufferParams const & params = buffer_.params();
-               if (!params.moduleCanBeAdded(argument)) {
+               if (!params.layoutModuleCanBeAdded(argument)) {
                        LYXERR0("Module `" << argument << 
                                "' cannot be added due to failed requirements or "
                                "conflicts with installed modules.");

diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index 73ece2e62f2264d276ed3c2fd7bac51ce8598459..dbdf691ba13878b78f06635b75102b6510781321 100644 (file)
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -341,7 +341,7 @@ void ModuleSelectionManager::updateAddPB()
        string const modname = getAvailableModel()->getIDString(idx.row());
 
        bool const enable =
-               container_->params().moduleCanBeAdded(modname);
+               container_->params().layoutModuleCanBeAdded(modname);
        addPB->setEnabled(enable);
 }