anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-26 19:25:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* src/tex2lyx/tex2lyx.cpp:

Browse Source 
- use internal_path (bug 3788), patch by Hangzai Luo and me).

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@18953 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Jürgen Spitzmüller 2007-07-01 15:16:08 +00:00
parent e72d2468df
commit d226c1de12
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/tex2lyx/tex2lyx.cpp
View File

@ -62,6 +62,7 @@ using support::isStrUnsignedInt;
using support::ltrim; using support::ltrim;
using support::makeAbsPath; using support::makeAbsPath;
using support::onlyPath; using support::onlyPath;
using support::os::internal_path;
using support::rtrim; using support::rtrim;
using support::isFileReadable; using support::isFileReadable;
@ -306,7 +307,7 @@ int parse_syntaxfile(string const & arg, string const &)
cerr << "Missing syntaxfile string after -s switch" << endl; cerr << "Missing syntaxfile string after -s switch" << endl;
exit(1); exit(1);
} }
syntaxfile = arg; syntaxfile = internal_path(arg);
return 1; return 1;
} }
@ -323,7 +324,7 @@ int parse_sysdir(string const & arg, string const &)
cerr << "Missing directory for -sysdir switch" << endl; cerr << "Missing directory for -sysdir switch" << endl;
exit(1); exit(1);
} }
cl_system_support = arg; cl_system_support = internal_path(arg);
return 1; return 1;
} }
@ -334,7 +335,7 @@ int parse_userdir(string const & arg, string const &)
cerr << "Missing directory for -userdir switch" << endl; cerr << "Missing directory for -userdir switch" << endl;
exit(1); exit(1);
} }
cl_user_support = arg; cl_user_support = internal_path(arg);
return 1; return 1;
} }
@ -512,7 +513,7 @@ int main(int argc, char * argv[])
lyx::support::os::init(argc, argv); lyx::support::os::init(argc, argv);
try { support::init_package(to_utf8(from_local8bit(argv[0])), try { support::init_package(internal_path(to_utf8(from_local8bit(argv[0]))),
cl_system_support, cl_user_support, cl_system_support, cl_user_support,
support::top_build_dir_is_two_levels_up); support::top_build_dir_is_two_levels_up);
} catch (support::ExceptionMessage const & message) { } catch (support::ExceptionMessage const & message) {
@ -524,12 +525,14 @@ int main(int argc, char * argv[])
// Now every known option is parsed. Look for input and output // Now every known option is parsed. Look for input and output
// file name (the latter is optional). // file name (the latter is optional).
string const infilename = makeAbsPath(to_utf8(from_local8bit(argv[1]))).absFilename(); string infilename = internal_path(to_utf8(from_local8bit(argv[1])));
infilename = makeAbsPath(infilename).absFilename();
string outfilename; string outfilename;
if (argc > 2) { if (argc > 2) {
outfilename = to_utf8(from_local8bit(argv[2])); outfilename = internal_path(to_utf8(from_local8bit(argv[2])));
if (outfilename != "-") if (outfilename != "-")
outfilename = makeAbsPath(to_utf8(from_local8bit(argv[2]))).absFilename(); outfilename = makeAbsPath(outfilename).absFilename();
} else } else
outfilename = changeExtension(infilename, ".lyx"); outfilename = changeExtension(infilename, ".lyx");