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';
"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
}
-DocumentClass * BufferParams::documentClassPtr() const {
+DocumentClass const * BufferParams::documentClassPtr() const {
return doc_class_;
}