#include "support/filetools.h"
#include "support/gettext.h"
#include "support/lstrings.h"
+#include "support/mutex.h"
+#include "support/docstream.h"
#include "support/os.h"
#include "support/PathChanger.h"
#include "support/Systemcall.h"
#include <map>
#include <ctime>
-// FIXME: Q_WS_MACX is not available, it's in Qt
+// FIXME: Q_OS_MAC is not available, it's in Qt
#ifdef USE_MACOSX_PACKAGING
#include "support/linkback/LinkBackProxy.h"
#endif
bool Format::formatSorter(Format const * lhs, Format const * rhs)
{
- return compare_locale(_(lhs->prettyname()), _(rhs->prettyname())) < 0;
+ return compare_locale(translateIfPossible(lhs->prettyname()),
+ translateIfPossible(rhs->prettyname())) < 0;
}
bool operator<(Format const & a, Format const & b)
{
- return compare_locale(_(a.prettyname()), _(b.prettyname())) < 0;
+ return compare_locale(translateIfPossible(a.prettyname()),
+ translateIfPossible(b.prettyname())) < 0;
}
-Format::Format(string const & n, string const & e, string const & p,
+Format::Format(string const & n, string const & e, docstring const & p,
string const & s, string const & v, string const & ed,
string const & m, int flags)
: name_(n), prettyname_(p), shortcut_(s), viewer_(v),
Format const * Formats::getFormat(string const & name) const
{
FormatList::const_iterator cit =
- find_if(formatlist.begin(), formatlist.end(),
+ find_if(formatlist_.begin(), formatlist_.end(),
FormatNamesEqual(name));
- if (cit != formatlist.end())
+ if (cit != formatlist_.end())
return &(*cit);
else
return 0;
int const max_count = 50;
int count = 0;
- // Maximum number of binary chars allowed for latex detection
- int const max_bin = 5;
-
string str;
string format;
bool firstLine = true;
bool backslash = false;
bool maybelatex = false;
- int binchars = 0;
int dollars = 0;
- while ((count++ < max_count) && format.empty() && binchars <= max_bin) {
+ while ((count++ < max_count) && format.empty() && !maybelatex) {
if (ifs.eof())
break;
// inline equation
maybelatex = true;
}
-
- binchars += count_bin_chars(str);
}
- if (format.empty() && binchars <= max_bin && maybelatex)
+ if (format.empty() && maybelatex && !isBinaryFile(fn))
format = "latex";
if (format.empty()) {
return string();
string psformat;
+ string format;
#ifdef HAVE_MAGIC_H
if (filename.exists()) {
magic_t magic_cookie = magic_open(MAGIC_MIME);
if (magic_cookie) {
- string format;
if (magic_load(magic_cookie, NULL) != 0) {
LYXERR(Debug::GRAPHICS, "Formats::getFormatFromFile\n"
<< "\tCouldn't load magic database - "
if (!mime.empty() && mime != "application/octet-stream" &&
mime != "text/plain") {
Formats::const_iterator cit =
- find_if(formatlist.begin(), formatlist.end(),
+ find_if(formatlist_.begin(), formatlist_.end(),
FormatMimeEqual(mime));
- if (cit != formats.end()) {
+ if (cit != formatlist_.end()) {
LYXERR(Debug::GRAPHICS, "\tgot format from MIME type: "
<< mime << " -> " << cit->name());
// See special eps/ps handling below
}
}
magic_close(magic_cookie);
- if (!format.empty())
+ // libmagic recognizes as latex also some formats of ours
+ // such as pstex and pdftex. Therefore we have to perform
+ // additional checks in this case (bug 9244).
+ if (!format.empty() && format != "latex")
return format;
}
}
#endif
- // libmagic does not distinguish eps and ps.
- // Therefore we need to use our own detection here, but only if it
- // recognizes either ps or eps. Otherwise the libmagic guess will
- // be better (bug 9146).
- string const format = guessFormatFromContents(filename);
- if (!psformat.empty()) {
- if (isPostScriptFileFormat(format))
+ string const ext = getExtension(filename.absFileName());
+ if (format.empty()) {
+ // libmagic does not distinguish eps and ps.
+ // Therefore we need to use our own detection here, but only if it
+ // recognizes either ps or eps. Otherwise the libmagic guess will
+ // be better (bug 9146).
+ format = guessFormatFromContents(filename);
+ if (!psformat.empty()) {
+ if (isPostScriptFileFormat(format))
+ return format;
+ else
+ return psformat;
+ }
+
+ if (isZippedFileFormat(format) && !ext.empty()) {
+ string const & fmt_name = getFormatFromExtension(ext);
+ if (!fmt_name.empty()) {
+ Format const * p_format = getFormat(fmt_name);
+ if (p_format && p_format->zippedNative())
+ return p_format->name();
+ }
+ }
+ // Don't simply return latex (bug 9244).
+ if (!format.empty() && format != "latex")
return format;
- else
- return psformat;
}
- string const ext = getExtension(filename.absFileName());
- if (isZippedFileFormat(format) && !ext.empty()) {
- string const & fmt_name = formats.getFormatFromExtension(ext);
- if (!fmt_name.empty()) {
- Format const * p_format = formats.getFormat(fmt_name);
- if (p_format && p_format->zippedNative())
- return p_format->name();
- }
+ // Both libmagic and our guessing from contents may return as latex
+ // also lyx files and our pstex and pdftex formats. In this case we
+ // give precedence to the format determined by the extension.
+ if (format == "latex") {
+ format = getFormatFromExtension(ext);
+ return format.empty() ? "latex" : format;
}
- if (!format.empty())
- return format;
// try to find a format from the file extension.
return getFormatFromExtension(ext);
// this is ambigous if two formats have the same extension,
// but better than nothing
Formats::const_iterator cit =
- find_if(formatlist.begin(), formatlist.end(),
+ find_if(formatlist_.begin(), formatlist_.end(),
FormatExtensionsEqual(ext));
- if (cit != formats.end()) {
+ if (cit != formatlist_.end()) {
LYXERR(Debug::GRAPHICS, "\twill guess format from file extension: "
<< ext << " -> " << cit->name());
return cit->name();
};
-// FIXME THREAD
/// Mapping absolute pathnames of files to their ZippedInfo metadata.
static std::map<std::string, ZippedInfo> zipped_;
+static Mutex zipped_mutex;
bool Formats::isZippedFile(support::FileName const & filename) const {
string const & fname = filename.absFileName();
time_t timestamp = filename.lastModified();
+ Mutex::Locker lock(&zipped_mutex);
map<string, ZippedInfo>::iterator it = zipped_.find(fname);
if (it != zipped_.end() && it->second.timestamp == timestamp)
return it->second.zipped;
+ // FIXME perf: This very expensive function is called on startup on each
+ // file whic is going to be parsed, and also on svgz icons. Maybe there is a
+ // quicker way to check whether a file is zipped? I.e. for icons we
+ // probably just need to check the extension (svgz vs svg).
string const & format = getFormatFromFile(filename);
bool zipped = (format == "gzip" || format == "zip");
zipped_.insert(make_pair(fname, ZippedInfo(zipped, timestamp)));
void Formats::setAutoOpen()
{
- FormatList::iterator fit = formatlist.begin();
- FormatList::iterator const fend = formatlist.end();
+ FormatList::iterator fit = formatlist_.begin();
+ FormatList::iterator const fend = formatlist_.end();
for ( ; fit != fend ; ++fit) {
fit->setViewer(fixCommand(fit->viewer(), fit->extension(), os::VIEW));
fit->setEditor(fixCommand(fit->editor(), fit->extension(), os::EDIT));
int Formats::getNumber(string const & name) const
{
FormatList::const_iterator cit =
- find_if(formatlist.begin(), formatlist.end(),
+ find_if(formatlist_.begin(), formatlist_.end(),
FormatNamesEqual(name));
- if (cit != formatlist.end())
- return distance(formatlist.begin(), cit);
+ if (cit != formatlist_.end())
+ return distance(formatlist_.begin(), cit);
else
return -1;
}
void Formats::add(string const & name)
{
if (!getFormat(name))
- add(name, name, name, string(), string(), string(),
+ add(name, name, from_utf8(name), string(), string(), string(),
string(), Format::document);
}
void Formats::add(string const & name, string const & extensions,
- string const & prettyname, string const & shortcut,
+ docstring const & prettyname, string const & shortcut,
string const & viewer, string const & editor,
string const & mime, int flags)
{
FormatList::iterator it =
- find_if(formatlist.begin(), formatlist.end(),
+ find_if(formatlist_.begin(), formatlist_.end(),
FormatNamesEqual(name));
- if (it == formatlist.end())
- formatlist.push_back(Format(name, extensions, prettyname,
+ if (it == formatlist_.end())
+ formatlist_.push_back(Format(name, extensions, prettyname,
shortcut, viewer, editor, mime, flags));
else
*it = Format(name, extensions, prettyname, shortcut, viewer,
void Formats::erase(string const & name)
{
FormatList::iterator it =
- find_if(formatlist.begin(), formatlist.end(),
+ find_if(formatlist_.begin(), formatlist_.end(),
FormatNamesEqual(name));
- if (it != formatlist.end())
- formatlist.erase(it);
+ if (it != formatlist_.end())
+ formatlist_.erase(it);
}
void Formats::sort()
{
- std::sort(formatlist.begin(), formatlist.end());
+ std::sort(formatlist_.begin(), formatlist_.end());
}
{
add(name);
FormatList::iterator it =
- find_if(formatlist.begin(), formatlist.end(),
+ find_if(formatlist_.begin(), formatlist_.end(),
FormatNamesEqual(name));
- if (it != formatlist.end())
+ if (it != formatlist_.end())
it->setViewer(command);
}
{
add(name);
FormatList::iterator it =
- find_if(formatlist.begin(), formatlist.end(),
+ find_if(formatlist_.begin(), formatlist_.end(),
FormatNamesEqual(name));
- if (it != formatlist.end())
+ if (it != formatlist_.end())
it->setEditor(command);
}
if (!contains(command, token_from_format))
command += ' ' + token_from_format;
- command = subst(command, token_from_format, quoteName(onlyFileName(filename.toFilesystemEncoding())));
- command = subst(command, token_path_format, quoteName(onlyPath(filename.toFilesystemEncoding())));
+ command = subst(command, token_from_format,
+ quoteName(onlyFileName(filename.toFilesystemEncoding()), quote_shell_filename));
+ command = subst(command, token_path_format,
+ quoteName(onlyPath(filename.toFilesystemEncoding()), quote_shell_filename));
command = subst(command, token_socket_format, quoteName(theServerSocket().address()));
LYXERR(Debug::FILES, "Executing command: " << command);
// FIXME UNICODE utf8 can be wrong for files
PathChanger p(filename.onlyPath());
Systemcall one;
- one.startscript(Systemcall::DontWait, command, buffer.filePath());
+ one.startscript(Systemcall::DontWait, command,
+ buffer.filePath(), buffer.layoutPos());
// we can't report any sort of error, since we aren't waiting
return true;
if (!contains(command, token_from_format))
command += ' ' + token_from_format;
- command = subst(command, token_from_format, quoteName(filename.toFilesystemEncoding()));
- command = subst(command, token_path_format, quoteName(onlyPath(filename.toFilesystemEncoding())));
+ command = subst(command, token_from_format,
+ quoteName(filename.toFilesystemEncoding(), quote_shell_filename));
+ command = subst(command, token_path_format,
+ quoteName(onlyPath(filename.toFilesystemEncoding()), quote_shell_filename));
command = subst(command, token_socket_format, quoteName(theServerSocket().address()));
LYXERR(Debug::FILES, "Executing command: " << command);
// FIXME UNICODE utf8 can be wrong for files
buffer.message(_("Executing command: ") + from_utf8(command));
Systemcall one;
- one.startscript(Systemcall::DontWait, command, buffer.filePath());
+ one.startscript(Systemcall::DontWait, command,
+ buffer.filePath(), buffer.layoutPos());
// we can't report any sort of error, since we aren't waiting
return true;
{
Format const * format = getFormat(name);
if (format)
- return from_utf8(format->prettyname());
+ return format->prettyname();
else
return from_utf8(name);
}
f.addPair(OutputParams::XML, "docbook-xml");
f.addPair(OutputParams::HTML, "xhtml");
f.addPair(OutputParams::TEXT, "text");
+ f.addPair(OutputParams::LYX, "lyx");
return f;
}
return flavorTranslator().find(fmt);
} */
-Formats formats;
-
-Formats system_formats;
-
-
} // namespace lyx