anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-11 11:08:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix problem with filename encoding in python script for graphics conversion

Browse Source 
* src/graphics/GraphicsConverter.C
	(build_script): convert the input filename from utf8 to the default
	locale encoding as it hopefully corresponds to the filesystem encoding.


git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@16592 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Enrico Forestieri 2007-01-08 03:03:12 +00:00
parent af5d8eabe7
commit 19b9427da7
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/graphics/GraphicsConverter.C
View File

@ -282,13 +282,22 @@ static void build_script(FileName const & from_file,
script << "#!/usr/bin/env python\n" script << "#!/usr/bin/env python\n"
"# -*- coding: utf-8 -*-\n" "# -*- coding: utf-8 -*-\n"
"import os, shutil, sys\n\n" "import os, shutil, sys, locale\n\n"
"def unlinkNoThrow(file):\n" "def unlinkNoThrow(file):\n"
" ''' remove a file, do not throw if an error occurs '''\n" " ''' remove a file, do not throw if an error occurs '''\n"
" try:\n" " try:\n"
" os.unlink(file)\n" " os.unlink(file)\n"
" except:\n" " except:\n"
" pass\n\n"; " pass\n\n"
"def utf8ToDefaultEncoding(file):\n"
" ''' if possible, convert to the default encoding '''\n"
" try:\n"
" language, output_encoding = locale.getdefaultlocale()\n"
" if output_encoding == None:\n"
" output_encoding = 'latin1'\n"
" return unicode(file, 'utf8').encode(output_encoding)\n"
" except:\n"
" return file\n\n";
// we do not use ChangeExtension because this is a basename // we do not use ChangeExtension because this is a basename
// which may nevertheless contain a '.' // which may nevertheless contain a '.'
@ -311,7 +320,9 @@ static void build_script(FileName const & from_file,
// in python, but the converters might be shell scripts and have more // in python, but the converters might be shell scripts and have more
// troubles with it. // troubles with it.
string outfile = addExtension(to_base.absFilename(), getExtension(from_file.absFilename())); string outfile = addExtension(to_base.absFilename(), getExtension(from_file.absFilename()));
script << "infile = " << quoteName(from_file.absFilename(), quote_python) << "\n" script << "infile = utf8ToDefaultEncoding("
<< quoteName(from_file.absFilename(), quote_python)
<< ")\n"
"outfile = " << quoteName(outfile, quote_python) << "\n" "outfile = " << quoteName(outfile, quote_python) << "\n"
"shutil.copy(infile, outfile)\n"; "shutil.copy(infile, outfile)\n";