Fix bug #7621 (Images are not displayed if path of temp folder contains accented characters)

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_2_0_X@39701 a592a061-630c-0410-9148-cb99ea01b6c8

src/graphics/GraphicsConverter.cpp

@@ -111,7 +111,7 @@ FileName const & Converter::convertedFile() const
 /** Build the conversion script.
  *  The script is output to the stream \p script.
  */
-static void build_script(FileName const & from_file, string const & to_file_base,
+static void build_script(string const & from_file, string const & to_file_base,
 		  string const & from_format, string const & to_format,
 		  ostream & script);
 
@@ -133,7 +133,9 @@ Converter::Impl::Impl(FileName const & from_file, string const & to_file_base,
 
 	// The conversion commands are stored in a stringstream
 	ostringstream script;
-	build_script(from_file, to_file_base, from_format, to_format, script);
+	build_script(from_file.toFilesystemEncoding(),
+		     to_file_.toFilesystemEncoding(),
+		     from_format, to_format, script);
 	LYXERR(Debug::GRAPHICS, "\tConversion script:"
 		   "\n--------------------------------------\n"
 		<< script.str()
@@ -208,8 +210,8 @@ static string const move_file(string const & from_file, string const & to_file)
 		return string();
 
 	ostringstream command;
-	command << "fromfile = toUnicode(" << from_file << ")\n"
-		<< "tofile = toUnicode("   << to_file << ")\n\n"
+	command << "fromfile = " << from_file << "\n"
+		<< "tofile = "   << to_file << "\n\n"
 		<< "try:\n"
 		<< "  os.rename(fromfile, tofile)\n"
 		<< "except:\n"
@@ -252,8 +254,8 @@ static void build_conversion_command(string const & command, ostream & script)
 }
 
 
-static void build_script(FileName const & from_file,
-		  string const & to_file_base,
+static void build_script(string const & from_file,
+		  string const & to_file,
 		  string const & from_format,
 		  string const & to_format,
 		  ostream & script)
@@ -270,18 +272,7 @@ static void build_script(FileName const & from_file,
 		  "  try:\n"
 		  "    os.unlink(file)\n"
 		  "  except:\n"
-		  "    pass\n\n"
-		  "def toUnicode(file):\n"
-		  "  ''' if possible, convert to python unicode format '''\n"
-		  "  try:\n"
-		  "    return unicode(file, 'utf8')\n"
-		  "  except:\n"
-		  "    return file\n\n";
-
-	// we do not use ChangeExtension because this is a basename
-	// which may nevertheless contain a '.'
-	string const to_file = to_file_base + '.'
-		+ formats.extension(to_format);
+		  "    pass\n\n";
 
 	EdgePath const edgepath = from_format.empty() ?
 		EdgePath() :
@@ -291,18 +282,18 @@ static void build_script(FileName const & from_file,
 	// Remember to remove the temp file because we only want the name...
 	static int counter = 0;
 	string const tmp = "gconvert" + convert<string>(counter++);
-	FileName const to_base = FileName::tempName(tmp);
+	string const to_base = FileName::tempName(tmp).toFilesystemEncoding();
 
 	// Create a copy of the file in case the original name contains
 	// problematic characters like ' or ". We can work around that problem
 	// in python, but the converters might be shell scripts and have more
 	// troubles with it.
-	string outfile = addExtension(to_base.absFileName(), getExtension(from_file.absFileName()));
-	script << "infile = toUnicode("
-			<< quoteName(from_file.absFileName(), quote_python)
-			<< ")\n"
-		  "outfile = toUnicode("
-			<< quoteName(outfile, quote_python) << ")\n"
+	string outfile = addExtension(to_base, getExtension(from_file));
+	script << "infile = "
+			<< quoteName(from_file, quote_python)
+			<< "\n"
+		  "outfile = "
+			<< quoteName(outfile, quote_python) << "\n"
 		  "shutil.copy(infile, outfile)\n";
 
 	// Some converters (e.g. lilypond) can only output files to the
@@ -310,16 +301,16 @@ static void build_script(FileName const & from_file,
 	// This has the added benefit that all other files that may be
 	// generated by the converter are deleted when LyX closes and do not
 	// clutter the real working directory.
-	script << "os.chdir(toUnicode("
-	       << quoteName(onlyPath(outfile)) << "))\n";
+	script << "os.chdir("
+	       << quoteName(onlyPath(outfile)) << ")\n";
 
 	if (edgepath.empty()) {
 		// Either from_format is unknown or we don't have a
 		// converter path from from_format to to_format, so we use
 		// the default converter.
 		script << "infile = outfile\n"
-		       << "outfile = toUnicode("
-		       << quoteName(to_file, quote_python) << ")\n";
+		       << "outfile = "
+		       << quoteName(to_file, quote_python) << "\n";
 
 		ostringstream os;
 		os << os::python() << ' '
@@ -357,15 +348,15 @@ static void build_script(FileName const & from_file,
 		// Build the conversion command
 		string const infile      = outfile;
 		string const infile_base = changeExtension(infile, string());
-		outfile = addExtension(to_base.absFileName(), conv.To->extension());
+		outfile = addExtension(to_base, conv.To->extension());
 
 		// Store these names in the python script
-		script << "infile = toUnicode("
-				<< quoteName(infile, quote_python) << ")\n"
-			  "infile_base = toUnicode("
-				<< quoteName(infile_base, quote_python) << ")\n"
-			  "outfile = toUnicode("
-				<< quoteName(outfile, quote_python) << ")\n"
+		script << "infile = "
+				<< quoteName(infile, quote_python) << "\n"
+			  "infile_base = "
+				<< quoteName(infile_base, quote_python) << "\n"
+			  "outfile = "
+				<< quoteName(outfile, quote_python) << "\n"
 			  "outdir  = os.path.dirname(outfile)\n" ;
 
 		// See comment about extra " quotes above (although that

status.20x

@@ -104,6 +104,9 @@ What's new
 - Restore nomenclature dialog's ability to take the symbol from an explicit
   or implicit selection.
 
+- Fix on-screen display of graphics when the name of the temporary directory
+  contains non-ascii characters (bug 7621).
+
 
 * ADVANCED FIND AND REPLACE