office/okular
office/okular
1
0
Fork 0
mirror of https://invent.kde.org/graphics/okular synced 2024-10-13 03:12:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Spawn kpsewhich using QProcess rather than KProcIO.

Browse source 
As discussed with Wilfried and Stefan.

svn path=/trunk/KDE/kdegraphics/kviewshell/plugins/dvi/; revision=482408
This commit is contained in:
Angus Leeming 2005-11-22 21:31:24 +00:00
parent 1e73bd360e
commit 63fce9712a
2 changed files with 31 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
fontEncoding.cpp
View file

@ -12,9 +12,8 @@
#include "fontEncoding.h"
#include "kvs_debug.h"
#include <kprocio.h>
#include <QFile>
#include <QProcess>
#include <QStringList>
#include <QTextStream>
@ -29,16 +28,22 @@ fontEncoding::fontEncoding(const QString &encName)
_isValid = false;
// Use kpsewhich to find the encoding file.
KProcIO proc;
QString encFileName;
proc << "kpsewhich" << encName;
if (proc.start(KProcess::Block) == false) {
QProcess kpsewhich;
kpsewhich.setReadChannelMode(QProcess::MergedChannels);
kpsewhich.start("kpsewhich",
QStringList() << encName,
QIODevice::ReadOnly|QIODevice::Text);
if (!kpsewhich.waitForStarted()) {
kdError(kvs::dvi) << "fontEncoding::fontEncoding(...): kpsewhich could not be started." << endl;
return;
}
proc.readln(encFileName);
encFileName = encFileName.trimmed();
// We wait here while the external program runs concurrently.
kpsewhich.waitForFinished(-1);
const QString encFileName = QString(kpsewhich.readAll()).trimmed();
if (encFileName.isEmpty()) {
kdError(kvs::dvi) << QString("fontEncoding::fontEncoding(...): The file '%1' could not be found by kpsewhich.").arg(encName) << endl;
return;

30
fontMap.cpp
View file

@ -12,9 +12,8 @@
#include "fontMap.h"
#include "kvs_debug.h"
#include <kprocio.h>
#include <QFile>
#include <QProcess>
#include <QTextStream>
//#define DEBUG_FONTMAP
@ -35,27 +34,34 @@ fontMap::fontMap()
// way to give both options at the same time, there is seemingly no
// other way than to try both options one after another. We use the
// teTeX 3.0 format first.
KProcIO proc;
proc << "kpsewhich" << "--format=map" << "ps2pk.map";
if (proc.start(KProcess::Block) == false) {
QProcess kpsewhich;
kpsewhich.start("kpsewhich",
QStringList() << "--format=map" << "ps2pk.map",
QIODevice::ReadOnly|QIODevice::Text);
if (!kpsewhich.waitForStarted()) {
kdError(kvs::dvi) << "fontMap::fontMap(): kpsewhich could not be started." << endl;
return;
}
QString map_fileName;
proc.readln(map_fileName);
map_fileName = map_fileName.trimmed();
// We wait here while the external program runs concurrently.
kpsewhich.waitForFinished(-1);
QString map_fileName = QString(kpsewhich.readAll()).trimmed();
if (map_fileName.isEmpty()) {
// Map file not found? Then we try the teTeX < 3.0 way of finding
// the file.
proc << "kpsewhich" << "--format=dvips config" << "ps2pk.map";
if (proc.start(KProcess::Block) == false) {
kpsewhich.start("kpsewhich",
QStringList() << "--format=dvips config" << "ps2pk.map",
QIODevice::ReadOnly|QIODevice::Text);
if (!kpsewhich.waitForStarted()) {
kdError(kvs::dvi) << "fontMap::fontMap(): kpsewhich could not be started." << endl;
return;
}
proc.readln(map_fileName);
map_fileName = map_fileName.trimmed();
kpsewhich.waitForFinished(-1);
map_fileName = QString(kpsewhich.readAll()).trimmed();
// If both versions fail, then there is nothing left to do.
if (map_fileName.isEmpty()) {
kdError(kvs::dvi) << "fontMap::fontMap(): The file 'ps2pk.map' could not be found by kpsewhich." << endl;