Continue to improve GtkLengthEntry

[lyx.git] / src / tex2lyx / tex2lyx.C

diff --git a/src/tex2lyx/tex2lyx.C b/src/tex2lyx/tex2lyx.C
index 29b4bd5d16859eb13fa4fc603bad1ed8cc4bdd3c..22c13660d118296d77d11a5f9210847f51d64bb8 100644 (file)
--- a/src/tex2lyx/tex2lyx.C
+++ b/src/tex2lyx/tex2lyx.C
@@ -52,6 +52,7 @@ using std::string;
 using std::vector;
 using std::map;
 
+using lyx::support::ChangeExtension;
 using lyx::support::isStrUnsignedInt;
 using lyx::support::ltrim;
 using lyx::support::MakeAbsPath;
@@ -495,8 +496,12 @@ int main(int argc, char * argv[])
        // file name (the latter is optional).
        string const infilename = MakeAbsPath(argv[1]);
        string outfilename;
-       if (argc > 2)
-               outfilename = MakeAbsPath(argv[2]);
+       if (argc > 2) {
+               outfilename = argv[2];
+               if (outfilename != "-")
+                       outfilename = MakeAbsPath(argv[2]);
+       } else
+               outfilename = ChangeExtension(infilename, ".lyx");
 
        string const system_syntaxfile = lyx::support::LibFileSearch("", "syntax.default");
        if (system_syntaxfile.empty()) {
@@ -510,7 +515,7 @@ int main(int argc, char * argv[])
        masterFilePath = OnlyPath(infilename);
        parentFilePath = masterFilePath;
 
-       if (outfilename.empty() || outfilename == "-") {
+       if (outfilename == "-") {
                if (tex2lyx(infilename, cout))
                        return EXIT_SUCCESS;
                else