#include "frontends/Alert.h"
#include "support/lyxalgo.h" // for lyx::count
+#include "support/convert.h"
#include "support/translator.h"
#include <boost/array.hpp>
namespace {
// Paragraph separation
-typedef Translator<std::string, BufferParams::PARSEP> ParSepTranslator;
+typedef Translator<string, BufferParams::PARSEP> ParSepTranslator;
-ParSepTranslator const init_parseptranslator() {
+ParSepTranslator const init_parseptranslator()
+{
ParSepTranslator translator(string_paragraph_separation[0], BufferParams::PARSEP_INDENT);
translator.addPair(string_paragraph_separation[1], BufferParams::PARSEP_SKIP);
return translator;
}
-ParSepTranslator const & parseptranslator() {
+ParSepTranslator const & parseptranslator()
+{
static ParSepTranslator translator = init_parseptranslator();
return translator;
}
+
// Quotes language
-typedef Translator<std::string, InsetQuotes::quote_language> QuotesLangTranslator;
+typedef Translator<string, InsetQuotes::quote_language> QuotesLangTranslator;
-QuotesLangTranslator const init_quoteslangtranslator() {
+QuotesLangTranslator const init_quoteslangtranslator()
+{
QuotesLangTranslator translator(string_quotes_language[0], InsetQuotes::EnglishQ);
translator.addPair(string_quotes_language[1], InsetQuotes::SwedishQ);
translator.addPair(string_quotes_language[2], InsetQuotes::GermanQ);
}
-QuotesLangTranslator const & quoteslangtranslator() {
+QuotesLangTranslator const & quoteslangtranslator()
+{
static QuotesLangTranslator translator = init_quoteslangtranslator();
return translator;
}
+
// Quote times
typedef Translator<int, InsetQuotes::quote_times> QuotesTimesTranslator;
-QuotesTimesTranslator const init_quotestimestranslator() {
+QuotesTimesTranslator const init_quotestimestranslator()
+{
QuotesTimesTranslator translator(1, InsetQuotes::SingleQ);
translator.addPair(2, InsetQuotes::DoubleQ);
return translator;
}
-QuotesTimesTranslator const & quotestimestranslator() {
+QuotesTimesTranslator const & quotestimestranslator()
+{
static QuotesTimesTranslator translator = init_quotestimestranslator();
return translator;
}
+
// Paper size
typedef Translator<std::string, VMARGIN_PAPER_TYPE> PaperSizeTranslator;
-PaperSizeTranslator const init_papersizetranslator() {
+PaperSizeTranslator const init_papersizetranslator()
+{
PaperSizeTranslator translator(string_papersize[0], VM_PAPER_DEFAULT);
translator.addPair(string_papersize[1], VM_PAPER_CUSTOM);
translator.addPair(string_papersize[2], VM_PAPER_USLETTER);
}
-PaperSizeTranslator const & papersizetranslator() {
+PaperSizeTranslator const & papersizetranslator()
+{
static PaperSizeTranslator translator = init_papersizetranslator();
return translator;
}
+
// Paper packages
-typedef Translator<std::string, PAPER_PACKAGES> PaperPackagesTranslator;
+typedef Translator<string, PAPER_PACKAGES> PaperPackagesTranslator;
-PaperPackagesTranslator const init_paperpackagestranslator() {
+PaperPackagesTranslator const init_paperpackagestranslator()
+{
PaperPackagesTranslator translator(string_paperpackages[0], PACKAGE_NONE);
translator.addPair(string_paperpackages[1], PACKAGE_A4);
translator.addPair(string_paperpackages[2], PACKAGE_A4WIDE);
}
-PaperPackagesTranslator const & paperpackagestranslator() {
+PaperPackagesTranslator const & paperpackagestranslator()
+{
static PaperPackagesTranslator translator = init_paperpackagestranslator();
return translator;
}
// Paper orientation
-typedef Translator<std::string, PAPER_ORIENTATION> PaperOrientationTranslator;
+typedef Translator<string, PAPER_ORIENTATION> PaperOrientationTranslator;
-PaperOrientationTranslator const init_paperorientationtranslator() {
+PaperOrientationTranslator const init_paperorientationtranslator()
+{
PaperOrientationTranslator translator(string_orientation[0], ORIENTATION_PORTRAIT);
translator.addPair(string_orientation[1], ORIENTATION_LANDSCAPE);
return translator;
}
-PaperOrientationTranslator const & paperorientationtranslator() {
+PaperOrientationTranslator const & paperorientationtranslator()
+{
static PaperOrientationTranslator translator = init_paperorientationtranslator();
return translator;
}
typedef Translator<int, LyXTextClass::PageSides> SidesTranslator;
-SidesTranslator const init_sidestranslator() {
+SidesTranslator const init_sidestranslator()
+{
SidesTranslator translator(1, LyXTextClass::OneSide);
translator.addPair(2, LyXTextClass::TwoSides);
return translator;
}
-SidesTranslator const & sidestranslator() {
+SidesTranslator const & sidestranslator()
+{
static SidesTranslator translator = init_sidestranslator();
return translator;
}
typedef Translator<int, BufferParams::AMS> AMSTranslator;
-AMSTranslator const init_amstranslator() {
+AMSTranslator const init_amstranslator()
+{
AMSTranslator translator(0, BufferParams::AMS_OFF);
translator.addPair(1, BufferParams::AMS_AUTO);
translator.addPair(2, BufferParams::AMS_ON);
}
-AMSTranslator const & amstranslator() {
+AMSTranslator const & amstranslator()
+{
static AMSTranslator translator = init_amstranslator();
return translator;
}
-
// Cite engine
typedef Translator<string, biblio::CiteEngine> CiteEngineTranslator;
-CiteEngineTranslator const init_citeenginetranslator() {
+CiteEngineTranslator const init_citeenginetranslator()
+{
CiteEngineTranslator translator("basic", biblio::ENGINE_BASIC);
translator.addPair("natbib_numerical", biblio::ENGINE_NATBIB_NUMERICAL);
translator.addPair("natbib_authoryear", biblio::ENGINE_NATBIB_AUTHORYEAR);
}
-CiteEngineTranslator const & citeenginetranslator() {
+CiteEngineTranslator const & citeenginetranslator()
+{
static CiteEngineTranslator translator = init_citeenginetranslator();
return translator;
}
typedef Translator<string, Spacing::Space> SpaceTranslator;
-SpaceTranslator const init_spacetranslator() {
+SpaceTranslator const init_spacetranslator()
+{
SpaceTranslator translator("default", Spacing::Default);
translator.addPair("single", Spacing::Single);
translator.addPair("onehalf", Spacing::Onehalf);
translator.addPair("double", Spacing::Double);
+ translator.addPair("other", Spacing::Other);
return translator;
}
-SpaceTranslator const & spacetranslator() {
+SpaceTranslator const & spacetranslator()
+{
static SpaceTranslator translator = init_spacetranslator();
return translator;
}
}
-struct BufferParams::Impl
+class BufferParams::Impl
{
+public:
Impl();
AuthorList authorlist;
BufferParams::Impl *
BufferParams::MemoryTraits::clone(BufferParams::Impl const * ptr)
{
+ BOOST_ASSERT(ptr);
+
return new BufferParams::Impl(*ptr);
}
}
-Bullet & BufferParams::temp_bullet(lyx::size_type index)
+Bullet & BufferParams::temp_bullet(lyx::size_type const index)
{
BOOST_ASSERT(index < 4);
return pimpl_->temp_bullets[index];
}
-Bullet const & BufferParams::temp_bullet(lyx::size_type index) const
+Bullet const & BufferParams::temp_bullet(lyx::size_type const index) const
{
BOOST_ASSERT(index < 4);
return pimpl_->temp_bullets[index];
}
-Bullet & BufferParams::user_defined_bullet(lyx::size_type index)
+Bullet & BufferParams::user_defined_bullet(lyx::size_type const index)
{
BOOST_ASSERT(index < 4);
return pimpl_->user_defined_bullets[index];
}
-Bullet const & BufferParams::user_defined_bullet(lyx::size_type index) const
+Bullet const & BufferParams::user_defined_bullet(lyx::size_type const index) const
{
BOOST_ASSERT(index < 4);
return pimpl_->user_defined_bullets[index];
return classname;
}
if (!getLyXTextClass().isTeXClassAvailable()) {
- string msg = bformat(_("The document uses a missing "
+ string const msg =
+ bformat(_("The document uses a missing "
"TeX class \"%1$s\".\n"), classname);
Alert::warning(_("Document class not available"),
msg + _("LyX will not be able to produce output."));
} else if (token == "\\spacing") {
string nspacing;
lex >> nspacing;
- float tmp_val = 0.0;
+ string tmp_val;
if (nspacing == "other") {
lex >> tmp_val;
}
<< "\n\\end_preamble\n";
}
- /* the options */
+ // the options
if (!options.empty()) {
os << "\\options " << options << '\n';
}
- /* then the text parameters */
+ // then the text parameters
if (language != ignore_language)
os << "\\language " << language->lang() << '\n';
os << "\\inputencoding " << inputenc
os << "\\papersize " << string_papersize[papersize2]
<< "\n\\paperpackage " << string_paperpackages[paperpackage]
- << "\n\\use_geometry " << use_geometry
+ << "\n\\use_geometry " << convert<string>(use_geometry)
<< "\n\\use_amsmath " << use_amsmath
<< "\n\\cite_engine " << citeenginetranslator().find(cite_engine)
- << "\n\\use_bibtopic " << use_bibtopic
+ << "\n\\use_bibtopic " << convert<string>(use_bibtopic)
<< "\n\\paperorientation " << string_orientation[orientation]
<< '\n';
}
}
- os << "\\tracking_changes " << tracking_changes << "\n";
+ os << "\\tracking_changes " << convert<string>(tracking_changes) << "\n";
if (tracking_changes) {
AuthorList::Authors::const_iterator it = pimpl_->authorlist.begin();
return use_babel;
}
+
void BufferParams::setPaperStuff()
{
papersize = PAPER_DEFAULT;
temp_bullet(index).setCharacter(temp_int);
lex >> temp_int;
user_defined_bullet(index).setSize(temp_int);
- temp_bullet(index).setSize(temp_int);
+ temp_bullet(index).setSize(temp_int);
}
if (!lex.next()) return;
int const index = lex.getInteger();
lex.next(true);
- string temp_str = lex.getString();
+ string const temp_str = lex.getString();
user_defined_bullet(index).setText(temp_str);
temp_bullet(index).setText(temp_str);