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

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@9962 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/tex2lyx/ChangeLog b/src/tex2lyx/ChangeLog
index 5d5633e1ee5ca5565e7b16291b2e89861e4ea8a1..dccc72ecf893251605e2f5455a35f049c3f86698 100644 (file)
--- a/src/tex2lyx/ChangeLog
+++ b/src/tex2lyx/ChangeLog
@@ -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"

diff --git a/src/tex2lyx/tex2lyx.C b/src/tex2lyx/tex2lyx.C
index 67f8d30cf36c2f6f1d40c86341a02df27bbe27ca..4fdba5a51fecd65343daffcb454c31d8e0f1d327 100644 (file)
--- a/src/tex2lyx/tex2lyx.C
+++ b/src/tex2lyx/tex2lyx.C
@@ -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);