Update tex2lyx and tests after 306b136c

diff --git a/src/tex2lyx/Preamble.cpp b/src/tex2lyx/Preamble.cpp
index 35bb506283947a1e70138f688b6962ec8584e858..0ae9a2798d1f93d8763263ed9f94d37c7f07a14c 100644 (file)
--- a/src/tex2lyx/Preamble.cpp
+++ b/src/tex2lyx/Preamble.cpp
@@ -1046,7 +1046,7 @@ void Preamble::handle_if(Parser & p, bool in_lyx_preamble)
 }
 
 
-bool Preamble::writeLyXHeader(ostream & os, bool subdoc)
+bool Preamble::writeLyXHeader(ostream & os, bool subdoc, string const & outfiledir)
 {
        // set the quote language
        // LyX only knows the following quotes languages:
@@ -1088,11 +1088,13 @@ bool Preamble::writeLyXHeader(ostream & os, bool subdoc)
        // output the LyX file settings
        // Important: Keep the version formatting in sync with LyX and
        //            lyx2lyx (bug 7951)
+       string const origin = roundtripMode() ? "roundtrip" : outfiledir;
        os << "#LyX file created by tex2lyx " << lyx_version_major << '.'
           << lyx_version_minor << '\n'
           << "\\lyxformat " << LYX_FORMAT << '\n'
           << "\\begin_document\n"
           << "\\begin_header\n"
+          << "\\origin " << origin << "\n"
           << "\\textclass " << h_textclass << "\n";
        string const raw = subdoc ? empty_string() : h_preamble.str();
        if (!raw.empty()) {

diff --git a/src/tex2lyx/Preamble.h b/src/tex2lyx/Preamble.h
index ffc9bda03be74575bf9536ee569e5f5a3d2c00a7..71367b1af4e14b328d59094d07570c7f0bae0afd 100644 (file)
--- a/src/tex2lyx/Preamble.h
+++ b/src/tex2lyx/Preamble.h
@@ -93,7 +93,8 @@ public:
        void parse(Parser & p, std::string const & forceclass,
                   TeX2LyXDocClass & tc);
        /// Writes the LyX file header from internal data
-       bool writeLyXHeader(std::ostream & os, bool subdoc);
+       bool writeLyXHeader(std::ostream & os, bool subdoc,
+                           std::string const & outfiledir);
 
        /// known polyglossia language names (including variants)
        static const char * const polyglossia_languages[];

diff --git a/src/tex2lyx/test/CJK.lyx.lyx b/src/tex2lyx/test/CJK.lyx.lyx
index 6b5186cf5ec6558a0e2c466254298456e25ff714..3eeccc5a6e51f91cb53291a5a41d27dcf3fc64ea 100644 (file)
--- a/src/tex2lyx/test/CJK.lyx.lyx
+++ b/src/tex2lyx/test/CJK.lyx.lyx
@@ -1,7 +1,8 @@
 #LyX file created by tex2lyx 2.2
-\lyxformat 489
+\lyxformat 490
 \begin_document
 \begin_header
+\origin roundtrip
 \textclass article
 \begin_preamble
 \usepackage{babel}

diff --git a/src/tex2lyx/test/CJKutf8.lyx.lyx b/src/tex2lyx/test/CJKutf8.lyx.lyx
index e398d2399c1f8435e7ca1d641bdabfd599da64d2..0baa3b8b80c41b4fff366f0d61f97199a928c200 100644 (file)
--- a/src/tex2lyx/test/CJKutf8.lyx.lyx
+++ b/src/tex2lyx/test/CJKutf8.lyx.lyx
@@ -1,7 +1,8 @@
 #LyX file created by tex2lyx 2.2
-\lyxformat 489
+\lyxformat 490
 \begin_document
 \begin_header
+\origin roundtrip
 \textclass article
 \begin_preamble
 \usepackage{babel}

diff --git a/src/tex2lyx/test/DummyDocument.lyx.lyx b/src/tex2lyx/test/DummyDocument.lyx.lyx
index eb38e2278cdeeb21e712e422d9b0c9e038777105..91f33fa13952b994e7232cab31969e68cbda634c 100644 (file)
--- a/src/tex2lyx/test/DummyDocument.lyx.lyx
+++ b/src/tex2lyx/test/DummyDocument.lyx.lyx
@@ -1,7 +1,8 @@
 #LyX file created by tex2lyx 2.2
-\lyxformat 489
+\lyxformat 490
 \begin_document
 \begin_header
+\origin roundtrip
 \textclass article
 \use_default_options false
 \maintain_unincluded_children false

diff --git a/src/tex2lyx/test/Dummy~Document.lyx.lyx b/src/tex2lyx/test/Dummy~Document.lyx.lyx
index b4c7ef132195df2e5b1f0ac6ca8f75bb745e4e0f..0bd5c2982d832cba48af4ddc9501d7279193612b 100644 (file)
--- a/src/tex2lyx/test/Dummy~Document.lyx.lyx
+++ b/src/tex2lyx/test/Dummy~Document.lyx.lyx
@@ -1,7 +1,8 @@
 #LyX file created by tex2lyx 2.2
-\lyxformat 489
+\lyxformat 490
 \begin_document
 \begin_header
+\origin roundtrip
 \textclass article
 \use_default_options false
 \maintain_unincluded_children false

diff --git a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx
index 99cc9eb6f966892d9ee691619e63764fc58d3d71..0e177ac47cc237f37c3ba0658c872fe1a489c439 100644 (file)
--- a/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx
+++ b/src/tex2lyx/test/XeTeX-polyglossia.lyx.lyx
@@ -1,7 +1,8 @@
 #LyX file created by tex2lyx 2.2
-\lyxformat 489
+\lyxformat 490
 \begin_document
 \begin_header
+\origin roundtrip
 \textclass article
 \begin_preamble
 

diff --git a/src/tex2lyx/test/algo2e.lyx.lyx b/src/tex2lyx/test/algo2e.lyx.lyx
index add9e0ebae387223993a484dfdaf24d71a2922b7..9d317ffc9fe870bbcbc46c198e98e5fe5a118143 100644 (file)
--- a/src/tex2lyx/test/algo2e.lyx.lyx
+++ b/src/tex2lyx/test/algo2e.lyx.lyx
@@ -1,7 +1,8 @@
 #LyX file created by tex2lyx 2.2
-\lyxformat 489
+\lyxformat 490
 \begin_document
 \begin_header
+\origin roundtrip
 \textclass article
 \begin_preamble
 

diff --git a/src/tex2lyx/test/box-color-size-space-align.lyx.lyx b/src/tex2lyx/test/box-color-size-space-align.lyx.lyx
index 199483de214b9db8e5c87c8ade7fdb3babe336ea..4518d8af0565345753cf497b9ba8b2fa02a66804 100644 (file)
--- a/src/tex2lyx/test/box-color-size-space-align.lyx.lyx
+++ b/src/tex2lyx/test/box-color-size-space-align.lyx.lyx
@@ -1,7 +1,8 @@
 #LyX file created by tex2lyx 2.2
-\lyxformat 489
+\lyxformat 490
 \begin_document
 \begin_header
+\origin roundtrip
 \textclass article
 \begin_preamble
 

diff --git a/src/tex2lyx/test/test-insets.lyx.lyx b/src/tex2lyx/test/test-insets.lyx.lyx
index 2a7ccee1dfd64c2fe2418321bb27f1bf3eb54e9b..1395837a6939eea38cce79cb67cac835803539e3 100644 (file)
--- a/src/tex2lyx/test/test-insets.lyx.lyx
+++ b/src/tex2lyx/test/test-insets.lyx.lyx
@@ -1,7 +1,8 @@
 #LyX file created by tex2lyx 2.2
-\lyxformat 489
+\lyxformat 490
 \begin_document
 \begin_header
+\origin roundtrip
 \textclass article
 \begin_preamble
 

diff --git a/src/tex2lyx/test/test-memoir.lyx.lyx b/src/tex2lyx/test/test-memoir.lyx.lyx
index 34c198361676f5227c7b4270f14bacf309b4143c..ee8c8d8bf91f99d09487f1f0d516c8268fc02e35 100644 (file)
--- a/src/tex2lyx/test/test-memoir.lyx.lyx
+++ b/src/tex2lyx/test/test-memoir.lyx.lyx
@@ -1,7 +1,8 @@
 #LyX file created by tex2lyx 2.2
-\lyxformat 489
+\lyxformat 490
 \begin_document
 \begin_header
+\origin roundtrip
 \textclass memoir
 \begin_preamble
 

diff --git a/src/tex2lyx/test/test-modules.lyx.lyx b/src/tex2lyx/test/test-modules.lyx.lyx
index ce2de1093ef735dbea1be7b42e0bd813b142bd51..b1e2247d58f7845c2b1ef6626a29340da9269eac 100644 (file)
--- a/src/tex2lyx/test/test-modules.lyx.lyx
+++ b/src/tex2lyx/test/test-modules.lyx.lyx
@@ -1,7 +1,8 @@
 #LyX file created by tex2lyx 2.2
-\lyxformat 489
+\lyxformat 490
 \begin_document
 \begin_header
+\origin roundtrip
 \textclass amsart
 \begin_preamble
 \usepackage{babel}

diff --git a/src/tex2lyx/test/test-refstyle-theorems.lyx.lyx b/src/tex2lyx/test/test-refstyle-theorems.lyx.lyx
index deb69c47995585d1accd6ef5421483d5e5c04d78..55b12660469fb3581696d6f48688b2ab4002ca53 100644 (file)
--- a/src/tex2lyx/test/test-refstyle-theorems.lyx.lyx
+++ b/src/tex2lyx/test/test-refstyle-theorems.lyx.lyx
@@ -1,7 +1,8 @@
 #LyX file created by tex2lyx 2.2
-\lyxformat 489
+\lyxformat 490
 \begin_document
 \begin_header
+\origin roundtrip
 \textclass book
 \begin_preamble
 \usepackage{babel}

diff --git a/src/tex2lyx/test/test-scr.lyx.lyx b/src/tex2lyx/test/test-scr.lyx.lyx
index 95723c942a888c554d96c4bf99674facf9386cbd..323dbedd649e61c6d11ef20e04330f7639e4513c 100644 (file)
--- a/src/tex2lyx/test/test-scr.lyx.lyx
+++ b/src/tex2lyx/test/test-scr.lyx.lyx
@@ -1,7 +1,8 @@
 #LyX file created by tex2lyx 2.2
-\lyxformat 489
+\lyxformat 490
 \begin_document
 \begin_header
+\origin roundtrip
 \textclass scrbook
 \begin_preamble
 \usepackage{babel}

diff --git a/src/tex2lyx/test/test-structure.lyx.lyx b/src/tex2lyx/test/test-structure.lyx.lyx
index bfcf8acfab9d8cbf41990ab181cfd08502543c44..3c25024d8ca42fb23fc90471ea4f27b86ef80d43 100644 (file)
--- a/src/tex2lyx/test/test-structure.lyx.lyx
+++ b/src/tex2lyx/test/test-structure.lyx.lyx
@@ -1,7 +1,8 @@
 #LyX file created by tex2lyx 2.2
-\lyxformat 489
+\lyxformat 490
 \begin_document
 \begin_header
+\origin roundtrip
 \textclass article
 \begin_preamble
 %% Special footnote code from the package 'stblftnt.sty'

diff --git a/src/tex2lyx/test/test.lyx.lyx b/src/tex2lyx/test/test.lyx.lyx
index a8b8240d26a6085b0906cd8380ba42ffc39fb886..0cc0fb687806754a2c4b81377ebfd3fe272c6195 100644 (file)
--- a/src/tex2lyx/test/test.lyx.lyx
+++ b/src/tex2lyx/test/test.lyx.lyx
@@ -1,7 +1,8 @@
 #LyX file created by tex2lyx 2.2
-\lyxformat 489
+\lyxformat 490
 \begin_document
 \begin_header
+\origin roundtrip
 \textclass article
 \begin_preamble
 % This is a test document for tex2lyx

diff --git a/src/tex2lyx/test/verbatim.lyx.lyx b/src/tex2lyx/test/verbatim.lyx.lyx
index 3e7c6e5d2671f15a47f334cff93f806d425a1d09..52f71aee10423fefd2b00d830bb83b8d93426ec6 100644 (file)
--- a/src/tex2lyx/test/verbatim.lyx.lyx
+++ b/src/tex2lyx/test/verbatim.lyx.lyx
@@ -1,7 +1,8 @@
 #LyX file created by tex2lyx 2.2
-\lyxformat 489
+\lyxformat 490
 \begin_document
 \begin_header
+\origin roundtrip
 \textclass article
 \use_default_options false
 \maintain_unincluded_children false

diff --git a/src/tex2lyx/tex2lyx.cpp b/src/tex2lyx/tex2lyx.cpp
index 57790ab12b91e877774ab1b35958fc4f8e717b39..5001ad0af59b8e44e2b7df21187b0de8186e976c 100644 (file)
--- a/src/tex2lyx/tex2lyx.cpp
+++ b/src/tex2lyx/tex2lyx.cpp
@@ -839,7 +839,8 @@ namespace {
  *  You must ensure that \p parentFilePathTeX is properly set before calling
  *  this function!
  */
-bool tex2lyx(idocstream & is, ostream & os, string encoding)
+bool tex2lyx(idocstream & is, ostream & os, string encoding,
+             string const & outfiledir)
 {
        // Set a sensible default encoding.
        // This is used until an encoding command is found.
@@ -905,7 +906,7 @@ bool tex2lyx(idocstream & is, ostream & os, string encoding)
                for (; it != end; ++it)
                        preamble.addModule(*it);
        }
-       if (!preamble.writeLyXHeader(os, !active_environments.empty())) {
+       if (!preamble.writeLyXHeader(os, !active_environments.empty(), outfiledir)) {
                cerr << "Could not write LyX file header." << endl;
                return false;
        }
@@ -924,7 +925,8 @@ bool tex2lyx(idocstream & is, ostream & os, string encoding)
 
 
 /// convert TeX from \p infilename to LyX and write it to \p os
-bool tex2lyx(FileName const & infilename, ostream & os, string const & encoding)
+bool tex2lyx(FileName const & infilename, ostream & os, string const & encoding,
+             string const & outfiledir)
 {
        ifdocstream is;
        // forbid buffering on this stream
@@ -937,7 +939,7 @@ bool tex2lyx(FileName const & infilename, ostream & os, string const & encoding)
        }
        string const oldParentFilePath = parentFilePathTeX;
        parentFilePathTeX = onlyPath(infilename.absFileName());
-       bool retval = tex2lyx(is, os, encoding);
+       bool retval = tex2lyx(is, os, encoding, outfiledir);
        parentFilePathTeX = oldParentFilePath;
        return retval;
 }
@@ -970,7 +972,8 @@ bool tex2lyx(string const & infilename, FileName const & outfilename,
        cerr << "Input file: " << infilename << "\n";
        cerr << "Output file: " << outfilename << "\n";
 #endif
-       return tex2lyx(FileName(infilename), os, encoding);
+       return tex2lyx(FileName(infilename), os, encoding,
+                      outfilename.onlyPath().absFileName() + '/');
 }
 
 
@@ -1122,7 +1125,7 @@ int TeX2LyXApp::run()
        if (outfilename == "-") {
                // assume same directory as input file
                masterFilePathLyX = masterFilePathTeX;
-               if (tex2lyx(FileName(infilename), cout, default_encoding))
+               if (tex2lyx(FileName(infilename), cout, default_encoding, masterFilePathLyX))
                        return EXIT_SUCCESS;
        } else {
                masterFilePathLyX = onlyPath(outfilename);