Merge branch 'master' into biblatex2

[features.git] / src / CiteEnginesList.cpp

diff --git a/src/CiteEnginesList.cpp b/src/CiteEnginesList.cpp
index 279063cafd37cf8d2c40f4db90fbfe605a17ce44..118c1b7a59ea1764bb98f30281398ff83e2e6695 100644 (file)
--- a/src/CiteEnginesList.cpp
+++ b/src/CiteEnginesList.cpp
@@ -38,11 +38,12 @@ CiteEnginesList theCiteEnginesList;
 
 
 LyXCiteEngine::LyXCiteEngine(string const & n, string const & i,
-                            vector<string> const & cet, vector<string> const & dbs,
+                            vector<string> const & cet, string const & cfm,
+                            vector<string> const & dbs,
                             string const & d, vector<string> const & p,
                             vector<string> const & r, vector<string> const & e):
-       name_(n), id_(i), engine_types_(cet), default_biblios_(dbs), description_(d),
-       package_list_(p), required_engines_(r), excluded_engines_(e),
+       name_(n), id_(i), engine_types_(cet), cite_framework_(cfm), default_biblios_(dbs),
+       description_(d), package_list_(p), required_engines_(r), excluded_engines_(e),
        checked_(false), available_(false)
 {
        filename_ = id_ + ".citeengine";
@@ -243,6 +244,10 @@ bool CiteEnginesList::read()
                                cet = split(cet, p, '|');
                                cets.push_back(p);
                        }
+                       if (!lex.next(true))
+                               break;
+                       string const citeframework = lex.getString();
+                       LYXERR(Debug::TCLASS, "CiteFramework: " << citeframework);
                        if (!lex.next(true))
                                break;
                        string db = lex.getString();
@@ -290,7 +295,7 @@ bool CiteEnginesList::read()
                        }
                        // This code is run when we have
                        // cename, fname, desc, pkgs, req and exc
-                       addCiteEngine(cename, fname, cets, dbs, desc, pkgs, req, exc);
+                       addCiteEngine(cename, fname, cets, citeframework, dbs, desc, pkgs, req, exc);
                } // end switch
        } //end while
 
@@ -304,11 +309,11 @@ bool CiteEnginesList::read()
 
 void CiteEnginesList::addCiteEngine(string const & cename,
        string const & filename, vector<string> const & cets,
-       vector<string> const & dbs, string const & description,
-       vector<string> const & pkgs, vector<string> const & req,
-       vector<string> const & exc)
+       string const & citeframework, vector<string> const & dbs,
+       string const & description, vector<string> const & pkgs,
+       vector<string> const & req, vector<string> const & exc)
 {
-       LyXCiteEngine ce(cename, filename, cets, dbs, description, pkgs, req, exc);
+       LyXCiteEngine ce(cename, filename, cets, citeframework, dbs, description, pkgs, req, exc);
        englist_.push_back(ce);
 }