anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

set tex2lyx master file path correctly for input files in a subdir

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9962 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Georg Baum 2005-05-20 16:50:03 +00:00
parent 0f52688b3a
commit fae970f4c2
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/tex2lyx/ChangeLog
View File

@ -1,3 +1,7 @@
2005-05-20 Georg Baum <Georg.Baum@post.rwth-aachen.de>
* tex2lyx.C (main): set correct masterFilePath for files like "subdir/file"
2005-04-18 Georg Baum <Georg.Baum@post.rwth-aachen.de>
* text.C (parse_comment): Don't start a new paragraph for "%\n"

7
src/tex2lyx/tex2lyx.C
View File

@ -54,6 +54,8 @@ using std::map;
using lyx::support::isStrUnsignedInt;
using lyx::support::ltrim;
using lyx::support::MakeAbsPath;
using lyx::support::OnlyPath;
using lyx::support::rtrim;
using lyx::support::IsFileReadable;
@ -414,10 +416,7 @@ int main(int argc, char * argv[])
return 2;
}
if (lyx::support::AbsolutePath(argv[1]))
masterFilePath = lyx::support::OnlyPath(argv[1]);
else
masterFilePath = lyx::support::getcwd();
masterFilePath = OnlyPath(MakeAbsPath(argv[1]));
tex2lyx(is, cout);