* Doxy.

[lyx.git] / src / BufferParams.cpp

diff --git a/src/BufferParams.cpp b/src/BufferParams.cpp
index 3f52f99702c0db6175f900fe5b62662ef5335e54..8df7ace37f7f5a603c5109d4b4c5cce92fc186f5 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';
@@ -1271,44 +1277,44 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
                lyxpreamble += oss.str();
        }
 
-       // only add \makeatletter and \makeatother when actually needed
-       bool makeatletter = false;
+       // Will be surrounded by \makeatletter and \makeatother when needed
+       docstring atlyxpreamble;
 
        // Some macros LyX will need
        docstring tmppreamble(from_ascii(features.getMacros()));
 
-       if (!tmppreamble.empty()) {
-               if (!makeatletter) {
-                       lyxpreamble += "\n\\makeatletter\n";
-                       makeatletter = true;
-               }
-               lyxpreamble += "\n%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% "
+       if (!tmppreamble.empty())
+               atlyxpreamble += "\n%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% "
                        "LyX specific LaTeX commands.\n"
                        + tmppreamble + '\n';
-       }
 
        // the text class specific preamble
        tmppreamble = features.getTClassPreamble();
-       if (!tmppreamble.empty()) {
-               if (!makeatletter) {
-                       lyxpreamble += "\n\\makeatletter\n";
-                       makeatletter = true;
-               }
-               lyxpreamble += "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% "
+       if (!tmppreamble.empty())
+               atlyxpreamble += "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% "
                        "Textclass specific LaTeX commands.\n"
                        + tmppreamble + '\n';
-       }
 
        /* the user-defined preamble */
-       if (!preamble.empty()) {
-               if (!makeatletter) {
-                       lyxpreamble += "\n\\makeatletter\n";
-                       makeatletter = true;
-               }
+       if (!preamble.empty())
                // FIXME UNICODE
-               lyxpreamble += "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% "
+               atlyxpreamble += "%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% "
                        "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
@@ -1343,16 +1349,14 @@ bool BufferParams::writeLaTeX(odocstream & os, LaTeXFeatures & features,
                }
        }
 
-       if (!bullets_def.empty()) {
-               if (!makeatletter) {
-                       lyxpreamble += "\n\\makeatletter\n";
-                       makeatletter = true;
-               }
-               lyxpreamble += bullets_def + "}\n\n";
-       }
+       if (!bullets_def.empty())
+               atlyxpreamble += bullets_def + "}\n\n";
 
-       if (makeatletter)
-               lyxpreamble += "\\makeatother\n\n";
+       if (atlyxpreamble.find(from_ascii("@")) != docstring::npos)
+               lyxpreamble += "\n\\makeatletter\n"
+                       + atlyxpreamble + "\\makeatother\n\n";
+       else
+               lyxpreamble += '\n' + atlyxpreamble;
 
        int const nlines =
                int(count(lyxpreamble.begin(), lyxpreamble.end(), '\n'));
@@ -1400,7 +1404,7 @@ DocumentClass const & BufferParams::documentClass() const
 }
 
 
-DocumentClass * BufferParams::documentClassPtr() const {
+DocumentClass const * BufferParams::documentClassPtr() const {
        return doc_class_;
 }