Revert 23154.

[lyx.git] / src / BufferParams.cpp

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 98376c5e5d9f3a75b37adcda9001798faa4b19ce..d22d94fd5232ebb6f2e5d48ff8b8bde5898b235a 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -529,7 +529,11 @@ string const BufferParams::readToken(Lexer & lex, string const & token,
                paragraph_separation = parseptranslator().find(parsep);
        } else if (token == "\\defskip") {
                lex.next();
-               pimpl_->defskip = VSpace(lex.getString());
+               string defskip = lex.getString();
+               if (defskip == "defskip")
+                       // this is invalid
+                       defskip = "medskip";
+               pimpl_->defskip = VSpace(defskip);
        } else if (token == "\\quotes_language") {
                string quotes_lang;
                lex >> quotes_lang;
@@ -615,6 +619,8 @@ string const BufferParams::readToken(Lexer & lex, string const & token,
                lex >> headsep;
        } else if (token == "\\footskip") {
                lex >> footskip;
+       } else if (token == "\\columnsep") {
+               lex >> columnsep;
        } else if (token == "\\paperfontsize") {
                lex >> fontsize;
        } else if (token == "\\papercolumns") {
@@ -764,6 +770,9 @@ void BufferParams::writeFile(ostream & os) const
        if (!footskip.empty())
                os << "\\footskip "
                   << VSpace(footskip).asLyXCommand() << '\n';
+       if (!columnsep.empty())
+               os << "\\columnsep " 
+                        << VSpace(columnsep).asLyXCommand() << '\n';
        os << "\\secnumdepth " << secnumdepth
           << "\n\\tocdepth " << tocdepth
           << "\n\\paragraph_separation "
@@ -1135,6 +1144,8 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
                        os << ",headsep=" << from_ascii(Length(headsep).asLatexString());
                if (!footskip.empty())
                        os << ",footskip=" << from_ascii(Length(footskip).asLatexString());
+               if (!columnsep.empty())
+                       os << ",columnsep=" << from_ascii(Length(columnsep).asLatexString());
                os << "}\n";
                texrow.newline();
        }