#include "BranchList.h"
#include "buffer_funcs.h"
#include "Bullet.h"
+#include "Color.h"
#include "debug.h"
#include "Encoding.h"
#include "gettext.h"
#include "LaTeXFeatures.h"
#include "Messages.h"
#include "ModuleList.h"
-#include "Color.h"
#include "Font.h"
#include "Lexer.h"
#include "LyXRC.h"
#include "insets/InsetListingsParams.h"
#include "support/convert.h"
+#include "support/docstream.h"
#include "support/filetools.h"
#include "support/Translator.h"
#include "support/lstrings.h"
-#include <boost/array.hpp>
-
#include <algorithm>
#include <sstream>
// Page sides
-typedef Translator<int, TextClass::PageSides> SidesTranslator;
+typedef Translator<int, PageSides> SidesTranslator;
SidesTranslator const init_sidestranslator()
{
- SidesTranslator translator(1, TextClass::OneSide);
- translator.addPair(2, TextClass::TwoSides);
+ SidesTranslator translator(1, OneSide);
+ translator.addPair(2, TwoSides);
return translator;
}
AuthorList authorlist;
BranchList branchlist;
- boost::array<Bullet, 4> temp_bullets;
- boost::array<Bullet, 4> user_defined_bullets;
+ Bullet temp_bullets[4];
+ Bullet user_defined_bullets[4];
Spacing spacing;
/** This is the amount of space used for paragraph_separation "skip",
* and for detached paragraphs in "indented" documents.
fontsTypewriterScale = 100;
inputenc = "auto";
graphicsDriver = "default";
- sides = TextClass::OneSide;
+ sides = OneSide;
columns = 1;
listings_params = string();
pagestyle = "default";
branch_ptr->setColor(color);
// Update also the Color table:
if (color == "none")
- color = lcolor.getX11Name(Color::background);
+ color = lcolor.getX11Name(Color_background);
// FIXME UNICODE
lcolor.setColor(to_utf8(branch), color);
// if needed
if (sides != tclass.sides()) {
switch (sides) {
- case TextClass::OneSide:
+ case OneSide:
clsoptions << "oneside,";
break;
- case TextClass::TwoSides:
+ case TwoSides:
clsoptions << "twoside,";
break;
}
language_options << language->babel();
}
// when Vietnamese is used, babel must directly be loaded with the
- // language options, not in the class options
- int viet = language_options.str().find("vietnam");
+ // language options, not in the class options, see
+ // http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg129417.html
+ size_t viet = language_options.str().find("vietnam");
// viet = string::npos when not found
if (lyxrc.language_global_options && !language_options.str().empty()
&& viet == string::npos)
// 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 problem, you can shift babel to its old place behind
- // the user-defined preamble
+ // 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
if (use_babel && !features.isRequired("jurabib")) {
// FIXME UNICODE
lyxpreamble += from_utf8(babelCall(language_options.str())) + '\n';
}
// When the language "japanese-plain" is used, the package "japanese" must
- // be loaded behind babel (it provides babel support for Japanese)
- // see http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg129680.html
- if (language->lang() == "japanese-plain")
+ // be loaded behind babel (it provides babel support for Japanese) but before
+ // hyperref, see
+ // http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg129680.html
+ if (language->lang() == "japanese-plain" &&
+ !getTextClass().provides("japanese")) {
+ //load babel in case it was not loaded due to an empty language list
+ if (language_options.str().empty())
+ lyxpreamble += "\\usepackage{babel}\n";
lyxpreamble += "\\usepackage{japanese}\n";
+ }
// PDF support.
// * Hyperref manual: "Make sure it comes last of your loaded
// * Has to be loaded before the "LyX specific LaTeX commands" to
// avoid errors with algorithm floats.
odocstringstream oss;
- pdfoptions().writeLaTeX(oss);
+ // use hyperref explicitely when it is required
+ pdfoptions().writeLaTeX(oss, features.isRequired("hyperref"));
lyxpreamble += oss.str();
// this might be useful...
Font const BufferParams::getFont() const
{
- Font f = getTextClass().defaultfont();
- f.setLanguage(language);
+ FontInfo f = getTextClass().defaultfont();
if (fontsDefaultFamily == "rmdefault")
- f.setFamily(Font::ROMAN_FAMILY);
+ f.setFamily(ROMAN_FAMILY);
else if (fontsDefaultFamily == "sfdefault")
- f.setFamily(Font::SANS_FAMILY);
+ f.setFamily(SANS_FAMILY);
else if (fontsDefaultFamily == "ttdefault")
- f.setFamily(Font::TYPEWRITER_FAMILY);
- return f;
+ f.setFamily(TYPEWRITER_FAMILY);
+ return Font(f, language);
}
if (lang_opts.empty())
return string();
// when Vietnamese is used, babel must directly be loaded with the
- // language options
- int viet = lang_opts.find("vietnam");
+ // language options, see
+ // http://www.mail-archive.com/lyx-devel@lists.lyx.org/msg129417.html
+ size_t viet = lang_opts.find("vietnam");
// viet = string::npos when not found
if (!lyxrc.language_global_options || viet != string::npos)
return "\\usepackage[" + lang_opts + "]{babel}";