Amend 6c3447c8: FindAdv: sometimes a space is added on some math symbols

[lyx.git] / src / LaTeXPackages.cpp

diff --git a/src/LaTeXPackages.cpp b/src/LaTeXPackages.cpp
index bee30558d372b3366bfc9f6fd99554b9c340ad1e..9e0ffe50241da2c27504a78ce44ee4049c1d9b37 100644 (file)
--- a/src/LaTeXPackages.cpp
+++ b/src/LaTeXPackages.cpp
@@ -16,13 +16,16 @@
 
 #include "LaTeXPackages.h"
 
-#include "Lexer.h"
-
 #include "support/convert.h"
 #include "support/debug.h"
 #include "support/FileName.h"
 #include "support/filetools.h"
+#include "support/gettext.h"
+#include "support/Lexer.h"
 #include "support/lstrings.h"
+#include "support/Package.h"
+
+#include "frontends/alert.h"
 
 
 using namespace std;
@@ -34,7 +37,7 @@ namespace lyx {
 LaTeXPackages::Packages LaTeXPackages::packages_;
 
 
-void LaTeXPackages::getAvailable()
+void LaTeXPackages::getAvailable(bool retry)
 {
        Lexer lex;
        support::FileName const real_file = libFileSearch("", "packages.lst");
@@ -51,6 +54,7 @@ void LaTeXPackages::getAvailable()
        packages_.clear();
 
        bool finished = false;
+       string lstformat = "1";
        // Parse config-file
        while (lex.isOK() && !finished) {
                switch (lex.lex()) {
@@ -62,10 +66,50 @@ 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 once and re-parse if not.
+       if (lstformat != "2") {
+               // If we have already reconfigured, check if there is an outdated config file
+               // which produces the outdated lstformat
+               if (retry) {
+                       // check if we have an outdated chkconfig.ltx file in user dir
+                       support::FileName chkconfig = fileSearch(addPath(package().user_support().absFileName(), ""),
+                                                                "chkconfig.ltx", string(), must_exist);
+                       if (chkconfig.empty()) {
+                               // nothing found. So we can only warn
+                               frontend::Alert::warning(_("Invalid package list format!"),
+                                       _("The format of your LaTeX packages list is wrong. Please file a bug report."));
+                               return;
+                       }
+                       // Found. Try to rename and warn.
+                       support::FileName chkconfig_bak;
+                       chkconfig_bak.set(chkconfig.absFileName() + ".bak");
+                       if (chkconfig.renameTo(chkconfig_bak))
+                               // renaming succeeded
+                               frontend::Alert::warning(_("Outdated configuration script detected!"),
+                                       _("We have detected an outdated script 'chkconfig.ltx' in your user directory.\n"
+                                         "The script has been renamed to 'chkconfig.ltx.bak'.\n"
+                                         "If you did not copy the script there by purpose, you can safely delete it."));
+                       else {
+                               // renaming failed
+                               frontend::Alert::warning(_("Outdated configuration script detected!"),
+                                       bformat(_("We have detected an outdated script 'chkconfig.ltx' in your user directory\n"
+                                         "(%1$s).\n"
+                                         "Please delete or update this file!"), from_utf8(chkconfig.absFileName())));
+                               return;
+                       }
+               }
+               package().reconfigureUserLyXDir("");
+               getAvailable(true);
+       }
 }