namespace lyx {
namespace support {
-bool IsLyXFilename(string const & filename)
+bool isLyXFilename(string const & filename)
{
return suffixIs(ascii_lowercase(filename), ".lyx");
}
-bool IsSGMLFilename(string const & filename)
+bool isSGMLFilename(string const & filename)
{
return suffixIs(ascii_lowercase(filename), ".sgml");
}
latex_path_extension extension,
latex_path_dots dots)
{
- string path = subst(original_path, "\\", "/");
+ // On cygwin, we may need windows or posix style paths.
+ string path = os::latex_path(original_path);
path = subst(path, "~", "\\string~");
if (path.find(' ') != string::npos) {
// We can't use '"' because " is sometimes active (e.g. if
// babel is loaded with the "german" option)
if (extension == EXCLUDE_EXTENSION) {
- string const base = ChangeExtension(path, string());
- string const ext = GetExtension(path);
+ // ChangeExtension calls os::internal_path internally
+ // so don't use it to remove the extension.
+ string const ext = getExtension(path);
+ string const base = ext.empty() ?
+ path :
+ path.substr(0, path.length() - ext.length() - 1);
// ChangeExtension calls os::internal_path internally
// so don't use it to re-add the extension.
path = "\\string\"" + base + "\\string\"." + ext;
// Substitutes spaces with underscores in filename (and path)
-string const MakeLatexName(string const & file)
+string const makeLatexName(string const & file)
{
- string name = OnlyFilename(file);
- string const path = OnlyPath(file);
+ string name = onlyFilename(file);
+ string const path = onlyPath(file);
for (string::size_type i = 0; i < name.length(); ++i)
name[i] &= 0x7f; // set 8th bit to 0
while ((pos = name.find_first_not_of(keep, pos)) != string::npos)
name[pos++] = '_';
- return AddName(path, name);
+ return addName(path, name);
}
-string const QuoteName(string const & name)
+string const quoteName(string const & name, quote_style style)
{
- return (os::shell() == os::UNIX) ?
- '\'' + name + '\'':
- '"' + name + '"';
+ switch(style) {
+ case quote_shell:
+ // This does not work for filenames containing " (windows)
+ // or ' (all other OSes). This can't be changed easily, since
+ // we would need to adapt the command line parser in
+ // Forkedcall::generateChild. Therefore we don't pass user
+ // filenames to child processes if possible. We store them in
+ // a python script instead, where we don't have these
+ // limitations.
+ return (os::shell() == os::UNIX) ?
+ '\'' + name + '\'':
+ '"' + name + '"';
+ case quote_python:
+ return "\"" + subst(subst(name, "\\", "\\\\"), "\"", "\\\"")
+ + "\"";
+ }
+ // shut up stupid compiler
+ return string();
}
-// Is a file readable ?
-bool IsFileReadable(string const & path)
+bool isFileReadable(FileName const & filename)
{
+ std::string const path = filename.toFilesystemEncoding();
return fs::exists(path) && !fs::is_directory(path) && fs::is_readable(path);
}
//returns true: dir writeable
// false: not writeable
-bool IsDirWriteable(string const & path)
+bool isDirWriteable(FileName const & path)
{
- lyxerr[Debug::FILES] << "IsDirWriteable: " << path << endl;
+ lyxerr[Debug::FILES] << "isDirWriteable: " << path << endl;
- string const tmpfl = tempName(path, "lyxwritetest");
+ FileName const tmpfl(tempName(path, "lyxwritetest"));
if (tmpfl.empty())
return false;
}
+#if 0
// Uses a string of paths separated by ";"s to find a file to open.
// Can't cope with pathnames with a ';' in them. Returns full path to file.
// If path entry begins with $$LyX/, use system_lyxdir
// If path entry begins with $$User/, use user_lyxdir
// Example: "$$User/doc;$$LyX/doc"
-string const FileOpenSearch(string const & path, string const & name,
+FileName const fileOpenSearch(string const & path, string const & name,
string const & ext)
{
- string real_file;
+ FileName real_file;
string path_element;
bool notfound = true;
string tmppath = split(path, path_element, ';');
path_element = subst(path_element, "$$User",
package().user_support());
- real_file = FileSearch(path_element, name, ext);
+ real_file = fileSearch(path_element, name, ext);
if (real_file.empty()) {
do {
notfound = false;
}
}
-#ifdef __EMX__
- if (ext.empty() && notfound) {
- real_file = FileOpenSearch(path, name, "exe");
- if (notfound) real_file = FileOpenSearch(path, name, "cmd");
- }
-#endif
return real_file;
}
+#endif
/// Returns a vector of all files in directory dir having extension ext.
-vector<string> const DirList(string const & dir, string const & ext)
+vector<FileName> const dirList(FileName const & dir, string const & ext)
{
// EXCEPTIONS FIXME. Rewrite needed when we turn on exceptions. (Lgb)
- vector<string> dirlist;
+ vector<FileName> dirlist;
- if (!(fs::exists(dir) && fs::is_directory(dir))) {
+ string const encoded_dir = dir.toFilesystemEncoding();
+ if (!(fs::exists(encoded_dir) && fs::is_directory(encoded_dir))) {
lyxerr[Debug::FILES]
<< "Directory \"" << dir
<< "\" does not exist to DirList." << endl;
extension += '.';
extension += ext;
- fs::directory_iterator dit(dir);
+ fs::directory_iterator dit(encoded_dir);
fs::directory_iterator end;
for (; dit != end; ++dit) {
string const & fil = dit->leaf();
- if (suffixIs(fil, extension)) {
- dirlist.push_back(fil);
- }
+ if (suffixIs(fil, extension))
+ dirlist.push_back(FileName::fromFilesystemEncoding(
+ encoded_dir + '/' + fil));
}
return dirlist;
}
// Returns the real name of file name in directory path, with optional
// extension ext.
-string const FileSearch(string const & path, string const & name,
- string const & ext)
+FileName const fileSearch(string const & path, string const & name,
+ string const & ext, search_mode mode)
{
// if `name' is an absolute path, we ignore the setting of `path'
// Expand Environmentvariables in 'name'
- string const tmpname = ReplaceEnvironmentPath(name);
- string fullname = MakeAbsPath(tmpname, path);
+ string const tmpname = replaceEnvironmentPath(name);
+ FileName fullname(makeAbsPath(tmpname, path));
// search first without extension, then with it.
- if (IsFileReadable(fullname))
+ if (isFileReadable(fullname))
return fullname;
if (ext.empty())
- return string();
- // Is it not more reasonable to use ChangeExtension()? (SMiyata)
- fullname += '.';
- fullname += ext;
- return IsFileReadable(fullname) ? fullname : string();
+ // We are done.
+ return mode == allow_unreadable ? fullname : FileName();
+ // Only add the extension if it is not already the extension of
+ // fullname.
+ if (getExtension(fullname.absFilename()) != ext)
+ fullname = FileName(addExtension(fullname.absFilename(), ext));
+ if (isFileReadable(fullname) || mode == allow_unreadable)
+ return fullname;
+ return FileName();
}
// 1) user_lyxdir
// 2) build_lyxdir (if not empty)
// 3) system_lyxdir
-string const LibFileSearch(string const & dir, string const & name,
+FileName const libFileSearch(string const & dir, string const & name,
string const & ext)
{
- string fullname = FileSearch(AddPath(package().user_support(), dir),
+ FileName fullname = fileSearch(addPath(package().user_support(), dir),
name, ext);
if (!fullname.empty())
return fullname;
if (!package().build_support().empty())
- fullname = FileSearch(AddPath(package().build_support(), dir),
+ fullname = fileSearch(addPath(package().build_support(), dir),
name, ext);
if (!fullname.empty())
return fullname;
- return FileSearch(AddPath(package().system_support(), dir), name, ext);
+ return fileSearch(addPath(package().system_support(), dir), name, ext);
}
-string const i18nLibFileSearch(string const & dir, string const & name,
+FileName const i18nLibFileSearch(string const & dir, string const & name,
string const & ext)
{
// the following comments are from intl/dcigettext.c. We try
string l;
lang = split(lang, l, ':');
while (!l.empty() && l != "C" && l != "POSIX") {
- string const tmp = LibFileSearch(dir,
+ FileName const tmp = libFileSearch(dir,
token(l, '_', 0) + '_' + name,
ext);
if (!tmp.empty())
lang = split(lang, l, ':');
}
- return LibFileSearch(dir, name, ext);
+ return libFileSearch(dir, name, ext);
}
-string const LibScriptSearch(string const & command_in)
+string const libScriptSearch(string const & command_in, quote_style style)
{
static string const token_scriptpath = "$$s/";
(command.size() - start_script) : pos2 - start_script;
// Does this script file exist?
- string const script =
- LibFileSearch(".", command.substr(start_script, size_script));
+ string const script =
+ libFileSearch(".", command.substr(start_script, size_script)).absFilename();
if (script.empty()) {
// Replace "$$s/" with ""
} else {
// Replace "$$s/foo/some_script" with "<path to>/some_script".
string::size_type const size_replace = size_script + 4;
- command.replace(pos1, size_replace, QuoteName(script));
+ command.replace(pos1, size_replace, quoteName(script, style));
}
return command;
namespace {
-string const createTmpDir(string const & tempdir, string const & mask)
+FileName const createTmpDir(FileName const & tempdir, string const & mask)
{
lyxerr[Debug::FILES]
<< "createTmpDir: tempdir=`" << tempdir << "'\n"
<< "createTmpDir: mask=`" << mask << '\'' << endl;
- string const tmpfl = tempName(tempdir, mask);
+ FileName const tmpfl(tempName(tempdir, mask));
// lyx::tempName actually creates a file to make sure that it
// stays unique. So we have to delete it before we can create
// a dir with the same name. Note also that we are not thread
if (tmpfl.empty() || mkdir(tmpfl, 0700)) {
lyxerr << "LyX could not create the temporary directory '"
<< tmpfl << "'" << endl;
- return string();
+ return FileName();
}
- return MakeAbsPath(tmpfl);
+ return tmpfl;
}
} // namespace anon
-bool destroyDir(string const & tmpdir)
+bool destroyDir(FileName const & tmpdir)
{
-
-#ifdef __EMX__
- Path p(user_lyxdir());
-#endif
- return fs::remove_all(tmpdir) > 0;
+ try {
+ return fs::remove_all(tmpdir.toFilesystemEncoding()) > 0;
+ } catch (fs::filesystem_error const & fe){
+ lyxerr << "Could not delete " << tmpdir << ". (" << fe.what() << ")" << std::endl;
+ return false;
+ }
}
package().temp_dir() + "/lyx_tmpbuf" +
convert<string>(count++);
- if (mkdir(tmpfl, 0777)) {
+ if (mkdir(FileName(tmpfl), 0777)) {
lyxerr << "LyX could not create the temporary directory '"
<< tmpfl << "'" << endl;
return string();
}
-string const createLyXTmpDir(string const & deflt)
+FileName const createLyXTmpDir(FileName const & deflt)
{
- if (!deflt.empty() && deflt != "/tmp") {
+ if (!deflt.empty() && deflt.absFilename() != "/tmp") {
if (mkdir(deflt, 0777)) {
-#ifdef __EMX__
- Path p(package().user_support());
-#endif
- if (IsDirWriteable(deflt)) {
+ if (isDirWriteable(deflt)) {
// deflt could not be created because it
// did exist already, so let's create our own
// dir inside deflt.
return createTmpDir(deflt, "lyx_tmpdir");
} else {
// some other error occured.
- return createTmpDir("/tmp", "lyx_tmpdir");
+ return createTmpDir(FileName("/tmp"), "lyx_tmpdir");
}
} else
return deflt;
} else {
-#ifdef __EMX__
- Path p(package().user_support());
-#endif
- return createTmpDir("/tmp", "lyx_tmpdir");
+ return createTmpDir(FileName("/tmp"), "lyx_tmpdir");
}
}
{
string temp = rtrim(os::internal_path(path), "/");
BOOST_ASSERT(!temp.empty());
- return mkdir(temp, permission) == 0;
+ return mkdir(FileName(temp), permission) == 0;
}
// Strip filename from path name
-string const OnlyPath(string const & filename)
+string const onlyPath(string const & filename)
{
// If empty filename, return empty
if (filename.empty())
// Convert relative path into absolute path based on a basepath.
// If relpath is absolute, just use that.
// If basepath is empty, use CWD as base.
-string const MakeAbsPath(string const & RelPath, string const & BasePath)
+FileName const makeAbsPath(string const & relPath, string const & basePath)
{
// checks for already absolute path
- if (os::is_absolute_path(RelPath))
- return RelPath;
+ if (os::is_absolute_path(relPath))
+ return FileName(relPath);
// Copies given paths
- string TempRel = os::internal_path(RelPath);
+ string tempRel = os::internal_path(relPath);
// Since TempRel is NOT absolute, we can safely replace "//" with "/"
- TempRel = subst(TempRel, "//", "/");
+ tempRel = subst(tempRel, "//", "/");
- string TempBase;
+ string tempBase;
- if (os::is_absolute_path(BasePath))
- TempBase = BasePath;
+ if (os::is_absolute_path(basePath))
+ tempBase = basePath;
else
- TempBase = AddPath(getcwd(), BasePath);
+ tempBase = addPath(getcwd().absFilename(), basePath);
// Handle /./ at the end of the path
- while (suffixIs(TempBase, "/./"))
- TempBase.erase(TempBase.length() - 2);
+ while (suffixIs(tempBase, "/./"))
+ tempBase.erase(tempBase.length() - 2);
// processes relative path
- string RTemp = TempRel;
- string Temp;
+ string rTemp = tempRel;
+ string temp;
- while (!RTemp.empty()) {
+ while (!rTemp.empty()) {
// Split by next /
- RTemp = split(RTemp, Temp, '/');
+ rTemp = split(rTemp, temp, '/');
- if (Temp == ".") continue;
- if (Temp == "..") {
+ if (temp == ".") continue;
+ if (temp == "..") {
// Remove one level of TempBase
- string::difference_type i = TempBase.length() - 2;
-#ifndef __EMX__
+ string::difference_type i = tempBase.length() - 2;
if (i < 0)
i = 0;
- while (i > 0 && TempBase[i] != '/')
+ while (i > 0 && tempBase[i] != '/')
--i;
if (i > 0)
-#else
- if (i < 2)
- i = 2;
- while (i > 2 && TempBase[i] != '/')
- --i;
- if (i > 2)
-#endif
- TempBase.erase(i, string::npos);
+ tempBase.erase(i, string::npos);
else
- TempBase += '/';
- } else if (Temp.empty() && !RTemp.empty()) {
- TempBase = os::current_root() + RTemp;
- RTemp.erase();
+ tempBase += '/';
+ } else if (temp.empty() && !rTemp.empty()) {
+ tempBase = os::current_root() + rTemp;
+ rTemp.erase();
} else {
// Add this piece to TempBase
- if (!suffixIs(TempBase, '/'))
- TempBase += '/';
- TempBase += Temp;
+ if (!suffixIs(tempBase, '/'))
+ tempBase += '/';
+ tempBase += temp;
}
}
// returns absolute path
- return os::internal_path(TempBase);
+ return FileName(os::internal_path(tempBase));
}
// Correctly append filename to the pathname.
// If pathname is '.', then don't use pathname.
// Chops any path of filename.
-string const AddName(string const & path, string const & fname)
+string const addName(string const & path, string const & fname)
{
- string const basename = OnlyFilename(fname);
+ string const basename = onlyFilename(fname);
string buf;
if (path != "." && path != "./" && !path.empty()) {
// Strips path from filename
-string const OnlyFilename(string const & fname)
+string const onlyFilename(string const & fname)
{
if (fname.empty())
return fname;
/// Returns true is path is absolute
-bool AbsolutePath(string const & path)
+bool absolutePath(string const & path)
{
return os::is_absolute_path(path);
}
// Create absolute path. If impossible, don't do anything
// Supports ./ and ~/. Later we can add support for ~logname/. (Asger)
-string const ExpandPath(string const & path)
+string const expandPath(string const & path)
{
// checks for already absolute path
- string RTemp = ReplaceEnvironmentPath(path);
- if (os::is_absolute_path(RTemp))
- return RTemp;
+ string rTemp = replaceEnvironmentPath(path);
+ if (os::is_absolute_path(rTemp))
+ return rTemp;
- string Temp;
- string const copy = RTemp;
+ string temp;
+ string const copy = rTemp;
// Split by next /
- RTemp = split(RTemp, Temp, '/');
+ rTemp = split(rTemp, temp, '/');
- if (Temp == ".")
- return getcwd() + '/' + RTemp;
+ if (temp == ".")
+ return getcwd().absFilename() + '/' + rTemp;
- if (Temp == "~")
- return package().home_dir() + '/' + RTemp;
+ if (temp == "~")
+ return package().home_dir() + '/' + rTemp;
- if (Temp == "..")
- return MakeAbsPath(copy);
+ if (temp == "..")
+ return makeAbsPath(copy).absFilename();
// Don't know how to handle this
return copy;
// Normalize a path. Constracts path/../path
// Can't handle "../../" or "/../" (Asger)
// Also converts paths like /foo//bar ==> /foo/bar
-string const NormalizePath(string const & path)
+string const normalizePath(string const & path)
{
- string TempBase;
- string RTemp;
- string Temp;
+ // Normalize paths like /foo//bar ==> /foo/bar
+ static boost::regex regex("/{2,}");
+ string const tmppath = boost::regex_merge(path, regex, "/");
- if (os::is_absolute_path(path))
- RTemp = path;
- else
- // Make implicit current directory explicit
- RTemp = "./" + path;
+ fs::path const npath = fs::path(tmppath, fs::no_check).normalize();
- // Normalise paths like /foo//bar ==> /foo/bar
- boost::RegEx regex("/{2,}");
- RTemp = regex.Merge(RTemp, "/");
+ if (!npath.is_complete())
+ return "./" + npath.string() + '/';
- while (!RTemp.empty()) {
- // Split by next /
- RTemp = split(RTemp, Temp, '/');
-
- if (Temp == ".") {
- TempBase = "./";
- } else if (Temp == "..") {
- // Remove one level of TempBase
- string::difference_type i = TempBase.length() - 2;
- while (i > 0 && TempBase[i] != '/')
- --i;
- if (i >= 0 && TempBase[i] == '/')
- TempBase.erase(i + 1, string::npos);
- else
- TempBase = "../";
- } else {
- TempBase += Temp + '/';
- }
- }
-
- // returns absolute path
- return TempBase;
+ return npath.string() + '/';
}
-string const GetFileContents(string const & fname)
+string const getFileContents(FileName const & fname)
{
- if (fs::exists(fname)) {
- ifstream ifs(fname.c_str());
+ string const encodedname = fname.toFilesystemEncoding();
+ if (fs::exists(encodedname)) {
+ ifstream ifs(encodedname.c_str());
ostringstream ofs;
if (ifs && ofs) {
ofs << ifs.rdbuf();
// Search the string for ${VAR} and $VAR and replace VAR using getenv.
-string const ReplaceEnvironmentPath(string const & path)
+string const replaceEnvironmentPath(string const & path)
{
// ${VAR} is defined as
// $\{[A-Za-z_][A-Za-z_0-9]*\}
// Make relative path out of two absolute paths
-string const MakeRelPath(string const & abspath, string const & basepath)
+string const makeRelPath(string const & abspath, string const & basepath)
// Makes relative path out of absolute path. If it is deeper than basepath,
// it's easy. If basepath and abspath share something (they are all deeper
// than some directory), it'll be rendered using ..'s. If they are completely
// Append sub-directory(ies) to a path in an intelligent way
-string const AddPath(string const & path, string const & path_2)
+string const addPath(string const & path, string const & path_2)
{
string buf;
string const path2 = os::internal_path(path_2);
}
-/*
- Change extension of oldname to extension.
- Strips path off if no_path == true.
- If no extension on oldname, just appends.
- */
-string const ChangeExtension(string const & oldname, string const & extension)
+string const changeExtension(string const & oldname, string const & extension)
{
string::size_type const last_slash = oldname.rfind('/');
string::size_type last_dot = oldname.rfind('.');
}
+string const removeExtension(string const & name)
+{
+ return changeExtension(name, string());
+}
+
+
+string const addExtension(string const & name, string const & extension)
+{
+ if (!extension.empty() && extension[0] != '.')
+ return name + '.' + extension;
+ return name + extension;
+}
+
+
/// Return the extension of the file (not including the .)
-string const GetExtension(string const & name)
+string const getExtension(string const & name)
{
string::size_type const last_slash = name.rfind('/');
string::size_type const last_dot = name.rfind('.');
// ZIP PK... http://www.halyava.ru/document/ind_arch.htm
// Z \037\235 UNIX compress
-string const getFormatFromContents(string const & filename)
+string const getFormatFromContents(FileName const & filename)
{
// paranoia check
- if (filename.empty() || !IsFileReadable(filename))
+ if (filename.empty() || !isFileReadable(filename))
return string();
- ifstream ifs(filename.c_str());
+ ifstream ifs(filename.toFilesystemEncoding().c_str());
if (!ifs)
// Couldn't open file...
return string();
/// check for zipped file
-bool zippedFile(string const & name)
+bool zippedFile(FileName const & name)
{
string const type = getFormatFromContents(name);
if (contains("gzip zip compress", type) && !type.empty())
string const unzippedFileName(string const & zipped_file)
{
- string const ext = GetExtension(zipped_file);
+ string const ext = getExtension(zipped_file);
if (ext == "gz" || ext == "z" || ext == "Z")
- return ChangeExtension(zipped_file, string());
+ return changeExtension(zipped_file, string());
return "unzipped_" + zipped_file;
}
-string const unzipFile(string const & zipped_file, string const & unzipped_file)
+FileName const unzipFile(FileName const & zipped_file, string const & unzipped_file)
{
- string const tempfile = unzipped_file.empty() ?
- unzippedFileName(zipped_file) : unzipped_file;
+ FileName const tempfile = FileName(unzipped_file.empty() ?
+ unzippedFileName(zipped_file.toFilesystemEncoding()) :
+ unzipped_file);
// Run gunzip
- string const command = "gunzip -c " + zipped_file + " > " + tempfile;
+ string const command = "gunzip -c " +
+ zipped_file.toFilesystemEncoding() + " > " +
+ tempfile.toFilesystemEncoding();
Systemcall one;
one.startscript(Systemcall::Wait, command);
// test that command was executed successfully (anon)
}
-string const MakeDisplayPath(string const & path, unsigned int threshold)
+docstring const makeDisplayPath(string const & path, unsigned int threshold)
{
string str = path;
string const home = package().home_dir();
// replace /home/blah with ~/
- if (prefixIs(str, home))
+ if (!home.empty() && prefixIs(str, home))
str = subst(str, home, "~");
if (str.length() <= threshold)
- return os::external_path(str);
+ return from_utf8(os::external_path(str));
string const prefix = ".../";
string temp;
if (str.empty()) {
// Yes, filename itself is too long.
// Pick the start and the end of the filename.
- str = OnlyFilename(path);
+ str = onlyFilename(path);
string const head = str.substr(0, threshold / 2 - 3);
string::size_type len = str.length();
str = head + "..." + tail;
}
- return os::external_path(prefix + str);
+ return from_utf8(os::external_path(prefix + str));
}
-bool LyXReadLink(string const & file, string & link, bool resolve)
+bool readLink(string const & file, string & link, bool resolve)
{
#ifdef HAVE_READLINK
char linkbuffer[512];
return false;
linkbuffer[nRead] = '\0'; // terminator
if (resolve)
- link = MakeAbsPath(linkbuffer, OnlyPath(file));
+ link = makeAbsPath(linkbuffer, onlyPath(file)).absFilename();
else
link = linkbuffer;
return true;
}
-cmd_ret const RunCommand(string const & cmd)
+cmd_ret const runCommand(string const & cmd)
{
// FIXME: replace all calls to RunCommand with ForkedCall
// (if the output is not needed) or the code in ispell.C
}
-string const findtexfile(string const & fil, string const & /*format*/)
+FileName const findtexfile(string const & fil, string const & /*format*/)
{
/* There is no problem to extend this function too use other
methods to look for files. It could be setup to look
// If the file can be found directly, we just return a
// absolute path version of it.
- if (fs::exists(fil))
- return MakeAbsPath(fil);
+ FileName const absfile(makeAbsPath(fil));
+ if (fs::exists(absfile.toFilesystemEncoding()))
+ return absfile;
// No we try to find it using kpsewhich.
// It seems from the kpsewhich manual page that it is safe to use
// should help it by setting additional path in the approp. envir.var.
string const kpsecmd = "kpsewhich " + fil;
- cmd_ret const c = RunCommand(kpsecmd);
+ cmd_ret const c = runCommand(kpsecmd);
lyxerr[Debug::LATEX] << "kpse status = " << c.first << '\n'
- << "kpse result = `" << rtrim(c.second, "\n")
+ << "kpse result = `" << rtrim(c.second, "\n\r")
<< '\'' << endl;
if (c.first != -1)
- return os::internal_path(rtrim(c.second, "\n\r"));
+ return FileName(os::internal_path(rtrim(to_utf8(from_filesystem8bit(c.second)),
+ "\n\r")));
else
- return string();
+ return FileName();
}
void removeAutosaveFile(string const & filename)
{
- string a = OnlyPath(filename);
+ string a = onlyPath(filename);
a += '#';
- a += OnlyFilename(filename);
+ a += onlyFilename(filename);
a += '#';
- if (fs::exists(a))
- unlink(a);
+ FileName const autosave(a);
+ if (fs::exists(autosave.toFilesystemEncoding()))
+ unlink(autosave);
}
-void readBB_lyxerrMessage(string const & file, bool & zipped,
+void readBB_lyxerrMessage(FileName const & file, bool & zipped,
string const & message)
{
lyxerr[Debug::GRAPHICS] << "[readBB_from_PSFile] "
}
-string const readBB_from_PSFile(string const & file)
+string const readBB_from_PSFile(FileName const & file)
{
// in a (e)ps-file it's an entry like %%BoundingBox:23 45 321 345
// It seems that every command in the header has an own line,
// %%BoundingBox: (atend)
// In this case we must check the end.
bool zipped = zippedFile(file);
- string const file_ = zipped ? unzipFile(file) : file;
+ FileName const file_ = zipped ? unzipFile(file) : file;
string const format = getFormatFromContents(file_);
if (format != "eps" && format != "ps") {
return string();
}
- std::ifstream is(file_.c_str());
+ static boost::regex bbox_re(
+ "^%%BoundingBox:\\s*([[:digit:]]+)\\s+([[:digit:]]+)\\s+([[:digit:]]+)\\s+([[:digit:]]+)");
+ std::ifstream is(file_.toFilesystemEncoding().c_str());
while (is) {
string s;
getline(is,s);
- if (contains(s,"%%BoundingBox:") && !contains(s,"atend")) {
- string const bb = ltrim(s.substr(14));
+ boost::smatch what;
+ if (regex_match(s, what, bbox_re)) {
+ // Our callers expect the tokens in the string
+ // separated by single spaces.
+ // FIXME: change return type from string to something
+ // sensible
+ ostringstream os;
+ os << what.str(1) << ' ' << what.str(2) << ' '
+ << what.str(3) << ' ' << what.str(4);
+ string const bb = os.str();
readBB_lyxerrMessage(file_, zipped, bb);
return bb;
}
}
-int compare_timestamps(string const & file1, string const & file2)
+int compare_timestamps(FileName const & filename1, FileName const & filename2)
{
- BOOST_ASSERT(AbsolutePath(file1));
- BOOST_ASSERT(AbsolutePath(file2));
-
// If the original is newer than the copy, then copy the original
// to the new directory.
+ string const file1 = filename1.toFilesystemEncoding();
+ string const file2 = filename2.toFilesystemEncoding();
int cmp = 0;
if (fs::exists(file1) && fs::exists(file2)) {
double const tmp = difftime(fs::last_write_time(file1),
projects / lyx.git / blobdiff