src/support/unlink.C: Fix an #include error

[lyx.git] / src / bufferparams.C

diff --git a/src/bufferparams.C b/src/bufferparams.C
index d81ca7036d81f958b96c16af00d9c1988c706a5c..959d087b79e8184aa0e00207a26f790a3f47b985 100644 (file)
--- a/src/bufferparams.C
+++ b/src/bufferparams.C
@@ -998,26 +998,26 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
        if (paragraph_separation) {
                switch (getDefSkip().kind()) {
                case VSpace::SMALLSKIP:
-                       os << "\\setlength\\parskip{\\smallskipamount}\n";
+                       os << "\\setlength{\\parskip}{\\smallskipamount}\n";
                        break;
                case VSpace::MEDSKIP:
-                       os << "\\setlength\\parskip{\\medskipamount}\n";
+                       os << "\\setlength{\\parskip}{\\medskipamount}\n";
                        break;
                case VSpace::BIGSKIP:
-                       os << "\\setlength\\parskip{\\bigskipamount}\n";
+                       os << "\\setlength{\\parskip}{\\bigskipamount}\n";
                        break;
                case VSpace::LENGTH:
-                       os << "\\setlength\\parskip{"
+                       os << "\\setlength{\\parskip}{"
                           << from_utf8(getDefSkip().length().asLatexString())
                           << "}\n";
                        break;
                default: // should never happen // Then delete it.
-                       os << "\\setlength\\parskip{\\medskipamount}\n";
+                       os << "\\setlength{\\parskip}{\\medskipamount}\n";
                        break;
                }
                texrow.newline();
 
-               os << "\\setlength\\parindent{0pt}\n";
+               os << "\\setlength{\\parindent}{0pt}\n";
                texrow.newline();
        }
 
@@ -1468,11 +1468,18 @@ Encoding const & BufferParams::encoding() const
 {
        if (inputenc == "auto")
                return *(language->encoding());
-       Encoding const * const enc = encodings.getFromLaTeXName(inputenc);
+       Encoding const * const enc = (inputenc == "default") ?
+               encodings.getFromLyXName("iso8859-1") :
+               encodings.getFromLaTeXName(inputenc);
        if (enc)
                return *enc;
-       lyxerr << "Unknown inputenc value `" << inputenc
-              << "'. Using `auto' instead." << endl;
+       if (inputenc == "default")
+               lyxerr << "Could not find iso8859-1 encoding for inputenc "
+                         "value `default'. Using inputenc `auto' instead."
+                      << endl;
+       else
+               lyxerr << "Unknown inputenc value `" << inputenc
+                      << "'. Using `auto' instead." << endl;
        return *(language->encoding());
 }