Typo.

[lyx.git] / src / BufferParams.cpp

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index b444a2b4a97b1d05574e59e7439e0e604d5fd31c..73bd2258a481e1e880c244ea0e71ee72c81e338e 100644 (file)
--- a/src/BufferParams.cpp
+++ b/src/BufferParams.cpp
@@ -68,7 +68,7 @@ static char const * const string_quotes_language[] = {
 
 
 static char const * const string_papersize[] = {
-       "default", "custom", "letterpaper", "executivepaper", "legalpaper",
+       "default", "custom", "letterpaper", "legalpaper", "executivepaper",
        "a3paper", "a4paper", "a5paper", "b3paper", "b4paper", "b5paper", ""
 };
 
@@ -522,6 +522,8 @@ string BufferParams::readToken(Lexer & lex, string const & token,
                lex >> fontsSansScale;
        } else if (token == "\\font_tt_scale") {
                lex >> fontsTypewriterScale;
+       } else if (token == "\\font_cjk") {
+               lex >> fontsCJK;
        } else if (token == "\\paragraph_separation") {
                string parsep;
                lex >> parsep;
@@ -727,7 +729,11 @@ void BufferParams::writeFile(ostream & os) const
           << "\n\\font_osf " << convert<string>(fontsOSF)
           << "\n\\font_sf_scale " << fontsSansScale
           << "\n\\font_tt_scale " << fontsTypewriterScale
-          << "\n\\graphics " << graphicsDriver << '\n';
+          << '\n';
+       if (!fontsCJK.empty()) {
+               os << "\\font_cjk " << fontsCJK << '\n';
+       }
+       os << "\n\\graphics " << graphicsDriver << '\n';
 
        if (!float_placement.empty()) {
                os << "\\float_placement " << float_placement << '\n';
@@ -1166,6 +1172,8 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
                        os << ",columnsep=" << from_ascii(Length(columnsep).asLatexString());
                os << "}\n";
                texrow.newline();
+       } else if (orientation == ORIENTATION_LANDSCAPE) {
+               features.require("papersize");
        }
 
        if (tokenPos(tclass.opt_pagestyle(),
@@ -1236,17 +1244,19 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
        // Line spacing
        lyxpreamble += from_utf8(spacing().writePreamble(tclass.provides("SetSpace")));
 
-       // We try to load babel late, in case it interferes
-       // with other packages. But some packages also need babel to be loaded
-       // before, e.g. jurabib has to be called after babel.
-       // So load babel after the optional packages but before the user-defined
-       // preamble. This allows the users to redefine babel commands, e.g. to
-       // translate the word "Index" to the German "Stichwortverzeichnis".
-       // For more infos why this place was chosen, see
+       // We try to load babel late, in case it interferes with other
+       // packages. But some packages also need babel to be loaded
+       // before, e.g. jurabib has to be called after babel. So load
+       // babel after the optional packages but before the
+       // user-defined preamble. This allows the users to redefine
+       // babel commands, e.g. to translate the word "Index" to the
+       // German "Stichwortverzeichnis". For more infos why this
+       // place was chosen, see
        // http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg128425.html
-       // If you encounter problems, you can shift babel to its old place behind
-       // the user-defined preamble. But in this case you must change the Vietnamese
-       // support from currently "\usepackage[vietnamese]{babel}" to:
+       // If you encounter problems, you can shift babel to its old
+       // place behind the user-defined preamble. But in this case
+       // you must change the Vietnamese support from currently
+       // "\usepackage[vietnamese]{babel}" to:
        // \usepackage{vietnamese}
        // \usepackage{babel}
        // because vietnamese must be loaded before hyperref
@@ -1296,6 +1306,22 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
                        "User specified LaTeX commands.\n"
                        + from_utf8(preamble) + '\n';
 
+       // subfig loads internally the LaTeX package "caption". As
+       // caption is a very popular package, users will load it in
+       // the preamble. Therefore we must load subfig behind the
+       // user-defined preamble and check if the caption package was
+       // loaded or not. For the case that caption is loaded before
+       // subfig, there is the subfig option "caption=false". This
+       // option also works when a koma-script class is used and
+       // koma's own caption commands are used instead of caption. We
+       // use \PassOptionsToPackage here because the user could have
+       // already loaded subfig in the preamble.
+       if (features.isRequired("subfig")) {
+               atlyxpreamble += "\\@ifundefined{showcaptionsetup}{}{%\n"
+                       " \\PassOptionsToPackage{caption=false}{subfig}}\n"
+                       "\\usepackage{subfig}\n";
+       }
+
        // Itemize bullet settings need to be last in case the user
        // defines their own bullets that use a package included
        // in the user-defined preamble -- ARRae
@@ -1383,7 +1409,7 @@ DocumentClass const & BufferParams::documentClass() const
 }
 
 
-DocumentClass * BufferParams::documentClassPtr() const {
+DocumentClass const * BufferParams::documentClassPtr() const {
        return doc_class_;
 }