static char const * const string_papersize[] = {
- "default", "custom", "letterpaper", "executivepaper", "legalpaper",
+ "default", "custom", "letterpaper", "legalpaper", "executivepaper",
"a3paper", "a4paper", "a5paper", "b3paper", "b4paper", "b5paper", ""
};
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;
<< "\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';
os << ",columnsep=" << from_ascii(Length(columnsep).asLatexString());
os << "}\n";
texrow.newline();
+ } else if (orientation == ORIENTATION_LANDSCAPE) {
+ features.require("papersize");
}
if (tokenPos(tclass.opt_pagestyle(),
// 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
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
}
}
- 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'));
}
-DocumentClass * BufferParams::documentClassPtr() const {
+DocumentClass const * BufferParams::documentClassPtr() const {
return doc_class_;
}
projects / lyx.git / blobdiff