X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Fsupport%2Ffiletools.h;h=fbc14f86a8d376c3d3539efbfb817fcf778274ea;hb=ee9ff6cb0cd7d8b0ef3c18e5bd166e12580a3bf4;hp=6bec3fb9dbf3417462b9882296a791a690343d29;hpb=b33182bc3db56275a3c3bfcaed1dd6aa69337d1f;p=lyx.git

diff --git a/src/support/filetools.h b/src/support/filetools.h
index 6bec3fb9db..fbc14f86a8 100644
--- a/src/support/filetools.h
+++ b/src/support/filetools.h
@@ -98,6 +98,13 @@ i18nLibFileSearch(std::string const & dir,
 		  std::string const & name,
 		  std::string const & ext = std::string());
 
+/** Same as libFileSearch(), but tries first to find a preferred
+  version of the file by appending the icon set name to the dir
+  */
+FileName const
+imageLibFileSearch(std::string & dir, std::string const & name,
+		   std::string const & ext = std::string());
+
 /// How to quote a filename
 enum quote_style {
 	/** Quote for the (OS dependant) shell. This is needed for command
@@ -118,8 +125,7 @@ enum quote_style {
  *  command will still fail, but the error message will make some sort of
  *  sense ;-)
  */
-std::string const libScriptSearch(std::string const & command,
-		quote_style style = quote_shell);
+std::string const commandPrep(std::string const & command);
 
 enum latex_path_extension {
 	PROTECT_EXTENSION,
@@ -240,6 +246,18 @@ std::string const onlyFileName(std::string const & fname);
 */
 std::string const replaceEnvironmentPath(std::string const & path);
 
+/**
+   Return a string to be used as a prefix to a command for setting the
+   environment of the TeX engine with respect to the path \p path.
+ */
+std::string latexEnvCmdPrefix(std::string const & path);
+
+/** Replace all references to a current directory (a lonely '.' or
+    the prefix "./") in \c pathlist with \c path. Also prefixes
+    all non-absolute paths with \c path.
+*/
+std::string const replaceCurdirPath(std::string const & path, std::string const & pathlist);
+
 /** Set \c link to the path \c file points to as a symbolic link.
     \return true if successful.
  */
@@ -256,9 +274,6 @@ bool readLink(FileName const & file, FileName & link);
 FileName const findtexfile(std::string const & fil,
 			      std::string const & format);
 
-/// read the BoundingBox entry from a ps/eps/pdf-file
-std::string const readBB_from_PSFile(FileName const & file);
-
 /** \param file1, file2 the two files to be compared. Must have absolute paths.
  *  \returns 1 if \c file1 has a more recent timestamp than \c file2,
  *           0 if their timestamps are the same,
@@ -268,10 +283,16 @@ std::string const readBB_from_PSFile(FileName const & file);
  */
 int compare_timestamps(FileName const & file1, FileName const & file2);
 
+/// \param lfuns: true if we're converting lfuns, false if prefs
+bool prefs2prefs(FileName const & filename, FileName const & tempfile,
+                 bool lfuns);
+
 typedef std::pair<int, std::string> cmd_ret;
 
 cmd_ret const runCommand(std::string const & cmd);
 
+int fileLock(const char * lock_file);
+void fileUnlock(int fd, const char * lock_file);
 
 } // namespace support
 } // namespace lyx