Update caret if needed when changing depth

[lyx.git] / src / LaTeXPackages.cpp

diff --git a/src/LaTeXPackages.cpp b/src/LaTeXPackages.cpp
index bee30558d372b3366bfc9f6fd99554b9c340ad1e..e708df1dfe2b2ac0d52dcd6a2ccd44a3d0d79a47 100644 (file)
--- a/src/LaTeXPackages.cpp
+++ b/src/LaTeXPackages.cpp
@@ -23,6 +23,7 @@
 #include "support/FileName.h"
 #include "support/filetools.h"
 #include "support/lstrings.h"
+#include "support/Package.h"
 
 
 using namespace std;
@@ -51,6 +52,7 @@ void LaTeXPackages::getAvailable()
        packages_.clear();
 
        bool finished = false;
+       string lstformat = "1";
        // Parse config-file
        while (lex.isOK() && !finished) {
                switch (lex.lex()) {
@@ -62,10 +64,20 @@ void LaTeXPackages::getAvailable()
                        // Parse optional version info
                        lex.eatLine();
                        string const v = trim(lex.getString());
+                       if (p == "!!fileformat") {
+                               lstformat = v;
+                               continue;
+                       }
                        packages_.insert(make_pair(p, v));
                }
                }
        }
+       // Check if the pkglist has current format.
+       // Reconfigure and re-parse if not.
+       if (lstformat != "2") {
+               package().reconfigureUserLyXDir("");
+               getAvailable();
+       }
 }