Merge branch 'master' of github.com:texstudio-org/texstudio

Author: sunderme

src/kpathseaParser.cpp

@@ -84,6 +84,7 @@ MiktexPackageScanner::MiktexPackageScanner(QString mpmcmd, QString settingsDir,
 	: PackageScanner(parent)
 {
 	this->mpmCmd = mpmcmd;
+    this->kpseWhichCmd = mpmcmd.replace("mpm.exe","kpsewhich.exe");
 	this->settingsDir = settingsDir;
 }
 
@@ -94,6 +95,13 @@ QString MiktexPackageScanner::mpm(const QString &arg)
 	return execProgram.m_standardOutput;
 }
 
+QString MiktexPackageScanner::kpsewhich(const QString &arg)
+{
+    ExecProgram execProgram(kpseWhichCmd + " " + arg, "");
+    execProgram.execAndWait();
+    return execProgram.m_standardOutput;
+}
+
 void MiktexPackageScanner::savePackageMap(const QHash<QString, QStringList> &map)
 {
 	QFile f(ensureTrailingDirSeparator(settingsDir) + "miktexPackageNames.dat");
@@ -123,7 +131,57 @@ QHash<QString, QStringList> MiktexPackageScanner::loadPackageMap()
 			result.insert(lst[0], lst[1].split(","));
 		}
 	}
-	return result;
+    return result;
+}
+
+QHash<QString, QStringList> MiktexPackageScanner::loadMiktexPackageMap()
+{
+    QHash<QString, QStringList> result;
+    // try to load packages-manifest.ini
+    QString txt=kpsewhich("-show-path=web2c");
+    QStringList paths=txt.split(';');
+    paths.pop_front(); // remove .
+    QString fn;
+    foreach(QString path,paths){
+        path.replace("web2c//","miktex/config/package-manifests.ini");
+        if(QFileInfo::exists(path.simplified())){
+            fn=path.simplified();
+            break;
+        }
+    }
+    if(!fn.isEmpty()){
+        QFile f(fn);
+        if (f.open(QFile::ReadOnly | QFile::Text)) {
+            QTextStream in(&f);
+            QString line;
+            QStringList lst;
+            QString name;
+            while (!in.atEnd()) {
+                line = in.readLine();
+                if(line.startsWith('[')){
+                    if(!name.isEmpty()){
+                        result.insert(name, lst);
+                        lst.clear();
+                    }
+                    // package name
+                    name=line.mid(1,line.size()-2);
+                }
+                if(line.startsWith("run[]=")){
+                    QString fn=line.mid(6);
+                    if(fn.contains('/')){
+                        int i=fn.lastIndexOf('/');
+                        fn=fn.mid(i+1);
+                    }
+                    if (fn.endsWith(".sty") || fn.endsWith(".cls")) {
+                        fn.chop(4);
+                        lst<<fn;
+                    }
+                }
+
+            }
+        }
+    }
+    return result;
 }
 
 QStringList MiktexPackageScanner::stysForPackage(const QString &pck)
@@ -133,13 +191,33 @@ QStringList MiktexPackageScanner::stysForPackage(const QString &pck)
 	bool inRunTimeFilesSection = false;
 	foreach (const QString &l, lines) {
 		if (!inRunTimeFilesSection) {
-			if (l.startsWith("run-time files:"))
+            if (l.startsWith("run-time files:")){
 				inRunTimeFilesSection = true;
+                // new output format has everything in the same line.
+                QString rest=l.mid(16);
+                // split at semicolon
+                QStringList styles=rest.split(';');
+                foreach(auto fn,styles){
+                    fn = QFileInfo(fn).fileName();
+                    if(fn.contains('/')){
+                        int i=fn.lastIndexOf('/');
+                        fn=fn.mid(i+1);
+                    }
+                    if (fn.endsWith(".sty") || fn.endsWith(".cls")) {
+                        fn.chop(4);
+                        result.append(fn);
+                    }
+                }
+            }
 			continue;
 		} else {
 			QString fn = l.simplified();
 			if (fn.endsWith(":")) break; // start of a new section
 			fn = QFileInfo(fn).fileName();
+            if(fn.contains('/')){
+                int i=fn.lastIndexOf('/');
+                fn=fn.mid(i+1);
+            }
 			if (fn.endsWith(".sty") || fn.endsWith(".cls")) {
 				fn.chop(4);
 				result.append(fn);
@@ -154,21 +232,26 @@ void MiktexPackageScanner::run()
     std::set<QString> results;
 
 	QHash<QString, QStringList> cachedStys = loadPackageMap();
+    QHash<QString, QStringList> cachedMiktexStys = loadMiktexPackageMap();
 
 	QStringList lstOfPackages = mpm("--list").split("\n");
 	foreach (QString pck, lstOfPackages) {
 		if (stopped)
 			return;
 		QStringList parts = pck.simplified().split(" "); // output format of "mpm --list": installation status, number of files, size, database name
 		if (parts.count() != 4) continue;
-		if (parts[0] != "i") continue; // not installed
+        if (parts[0] != "i" && parts[0].toLower() != "true") continue; // not installed
 		pck = parts[3];
 		QStringList stys;
 		if (cachedStys.contains(pck)) {
 			stys = cachedStys.value(pck);
 		} else {
-			stys = stysForPackage(pck);
-			cachedStys.insert(pck, stys);
+            if(cachedMiktexStys.contains(pck)){
+                stys = cachedMiktexStys.value(pck);
+            }else{
+                stys = stysForPackage(pck);
+                cachedStys.insert(pck, stys);
+            }
 		}
 		foreach (const QString &sty, stys) {
 			results.insert(sty);

src/kpathseaParser.h

@@ -54,12 +54,14 @@ class MiktexPackageScanner : public PackageScanner
 protected:
 	void run();
 	QString mpm(const QString &arg);
+    QString kpsewhich(const QString &arg);
 	void savePackageMap(const QHash<QString, QStringList> &map);
 	QHash<QString, QStringList> loadPackageMap();
+    QHash<QString, QStringList> loadMiktexPackageMap();
 	QStringList stysForPackage(const QString &pck);
 
 private:
-	QString mpmCmd;
+    QString mpmCmd,kpseWhichCmd;
 	QString settingsDir;
 };