diff --git a/src/backends/R/rexpression.cpp b/src/backends/R/rexpression.cpp --- a/src/backends/R/rexpression.cpp +++ b/src/backends/R/rexpression.cpp @@ -102,10 +102,14 @@ { qDebug()<<"its PostScript"; setResult(new Cantor::EpsResult(QUrl::fromLocalFile(file))); - } else if(type.inherits(QLatin1String("text/plain"))) + } + else if(type.inherits(QLatin1String("text/plain")) + || type.inherits(QLatin1String("application/x-extension-html"))) { //Htmls are also plain texts, combining this in one - if(type.inherits(QLatin1String("text/html"))) + const bool isHtml = type.inherits(QLatin1String("text/html")) + || type.inherits(QLatin1String("application/x-extension-html")); + if(isHtml) qDebug()<<"its a HTML document"; else qDebug()<<"its plain text"; @@ -118,7 +122,7 @@ setStatus(Cantor::Expression::Error); } QString content=QTextStream(&f).readAll(); - if (!type.inherits(QLatin1String("text/html"))) + if (!isHtml) { //Escape whitespace content.replace( QLatin1Char(' '), QLatin1String(" ")); diff --git a/src/backends/R/rserver/rserver.cpp b/src/backends/R/rserver/rserver.cpp --- a/src/backends/R/rserver/rserver.cpp +++ b/src/backends/R/rserver/rserver.cpp @@ -84,9 +84,9 @@ { new RAdaptor(this); + m_tmpDir = QDir::tempPath() + QString::fromLatin1("/cantor_rserver-%1").arg(getpid()); QDir dir; - dir.mkdir(QDir::tempPath() + QString::fromLatin1("/cantor/rserver-%1").arg(getpid())); - m_tmpDir=QDir::tempPath() + QString::fromLatin1("/cantor/rserver-%1").arg(getpid()); + dir.mkdir(m_tmpDir); qDebug()<<"storing plots at "<