#include <config.h>
#include "bufferparams.h"
+
+#include "author.h"
+#include "BranchList.h"
+#include "Bullet.h"
#include "debug.h"
#include "encoding.h"
#include "gettext.h"
#include "language.h"
#include "LaTeXFeatures.h"
-#include "support/std_sstream.h"
+#include "LColor.h"
#include "lyxlex.h"
+#include "lyxrc.h"
#include "lyxtextclasslist.h"
+#include "outputparams.h"
#include "tex-strings.h"
+#include "Spacing.h"
#include "texrow.h"
+#include "vspace.h"
#include "frontends/Alert.h"
#include "support/lyxalgo.h" // for lyx::count
+#include "support/translator.h"
+#include <boost/array.hpp>
-using namespace lyx::support;
+#include <sstream>
+
+namespace support = lyx::support;
+using lyx::support::bformat;
+using lyx::support::rtrim;
+using lyx::support::tokenPos;
-using std::ostream;
using std::endl;
+using std::string;
+using std::istringstream;
+using std::ostream;
+using std::ostringstream;
using std::pair;
+namespace biblio = lyx::biblio;
+
+
+// Local translators
+namespace {
+
+// Paragraph separation
+typedef Translator<std::string, BufferParams::PARSEP> 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() {
+ static ParSepTranslator translator = init_parseptranslator();
+ return translator;
+}
+
+// Quotes language
+typedef Translator<std::string, InsetQuotes::quote_language> 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);
+ translator.addPair(string_quotes_language[3], InsetQuotes::PolishQ);
+ translator.addPair(string_quotes_language[4], InsetQuotes::FrenchQ);
+ translator.addPair(string_quotes_language[5], InsetQuotes::DanishQ);
+ return translator;
+}
+
+
+QuotesLangTranslator const & quoteslangtranslator() {
+ static QuotesLangTranslator translator = init_quoteslangtranslator();
+ return translator;
+}
+
+// Quote times
+typedef Translator<int, InsetQuotes::quote_times> QuotesTimesTranslator;
+
+
+QuotesTimesTranslator const init_quotestimestranslator() {
+ QuotesTimesTranslator translator(1, InsetQuotes::SingleQ);
+ translator.addPair(2, InsetQuotes::DoubleQ);
+ return translator;
+}
+
+
+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 translator(string_papersize[0], VM_PAPER_DEFAULT);
+ translator.addPair(string_papersize[1], VM_PAPER_CUSTOM);
+ translator.addPair(string_papersize[2], VM_PAPER_USLETTER);
+ translator.addPair(string_papersize[3], VM_PAPER_USLEGAL);
+ translator.addPair(string_papersize[4], VM_PAPER_USEXECUTIVE);
+ translator.addPair(string_papersize[5], VM_PAPER_A3);
+ translator.addPair(string_papersize[6], VM_PAPER_A4);
+ translator.addPair(string_papersize[7], VM_PAPER_A5);
+ translator.addPair(string_papersize[8], VM_PAPER_B3);
+ translator.addPair(string_papersize[9], VM_PAPER_B4);
+ translator.addPair(string_papersize[10], VM_PAPER_B5);
+ return translator;
+}
+
+
+PaperSizeTranslator const & papersizetranslator() {
+ static PaperSizeTranslator translator = init_papersizetranslator();
+ return translator;
+}
+
+// Paper packages
+typedef Translator<std::string, PAPER_PACKAGES> 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);
+ translator.addPair(string_paperpackages[3], PACKAGE_WIDEMARGINSA4);
+ return translator;
+}
+
+
+PaperPackagesTranslator const & paperpackagestranslator() {
+ static PaperPackagesTranslator translator = init_paperpackagestranslator();
+ return translator;
+}
+
+
+// Paper orientation
+typedef Translator<std::string, PAPER_ORIENTATION> PaperOrientationTranslator;
+
+
+PaperOrientationTranslator const init_paperorientationtranslator() {
+ PaperOrientationTranslator translator(string_orientation[0], ORIENTATION_PORTRAIT);
+ translator.addPair(string_orientation[1], ORIENTATION_LANDSCAPE);
+ return translator;
+}
+
+
+PaperOrientationTranslator const & paperorientationtranslator() {
+ static PaperOrientationTranslator translator = init_paperorientationtranslator();
+ return translator;
+}
+
+
+// Page sides
+typedef Translator<int, LyXTextClass::PageSides> SidesTranslator;
+
+
+SidesTranslator const init_sidestranslator() {
+ SidesTranslator translator(1, LyXTextClass::OneSide);
+ translator.addPair(2, LyXTextClass::TwoSides);
+ return translator;
+}
+
+
+SidesTranslator const & sidestranslator() {
+ static SidesTranslator translator = init_sidestranslator();
+ return translator;
+}
+
+
+
+// AMS
+typedef Translator<int, BufferParams::AMS> AMSTranslator;
+
+
+AMSTranslator const init_amstranslator() {
+ AMSTranslator translator(0, BufferParams::AMS_OFF);
+ translator.addPair(1, BufferParams::AMS_AUTO);
+ translator.addPair(2, BufferParams::AMS_ON);
+ return translator;
+}
+
+
+AMSTranslator const & amstranslator() {
+ static AMSTranslator translator = init_amstranslator();
+ return translator;
+}
+
+
+
+// Cite engine
+typedef Translator<string, biblio::CiteEngine> 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);
+ translator.addPair("jurabib", biblio::ENGINE_JURABIB);
+ return translator;
+}
+
+
+CiteEngineTranslator const & citeenginetranslator() {
+ static CiteEngineTranslator translator = init_citeenginetranslator();
+ return translator;
+}
+
+
+// Spacing
+typedef Translator<string, Spacing::Space> 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);
+ return translator;
+}
+
+
+SpaceTranslator const & spacetranslator() {
+ static SpaceTranslator translator = init_spacetranslator();
+ return translator;
+}
+
+// ends annonym namespace
+}
+
+
+struct BufferParams::Impl
+{
+ Impl();
+
+ AuthorList authorlist;
+ BranchList branchlist;
+ boost::array<Bullet, 4> temp_bullets;
+ boost::array<Bullet, 4> user_defined_bullets;
+ Spacing spacing;
+ /** This is the amount of space used for paragraph_separation "skip",
+ * and for detached paragraphs in "indented" documents.
+ */
+ VSpace defskip;
+};
+
+
+BufferParams::Impl::Impl()
+ : defskip(VSpace::MEDSKIP)
+{
+ // set initial author
+ authorlist.record(Author(lyxrc.user_name, lyxrc.user_email));
+}
+
+
+BufferParams::Impl *
+BufferParams::MemoryTraits::clone(BufferParams::Impl const * ptr)
+{
+ return new BufferParams::Impl(*ptr);
+}
+
+
+void BufferParams::MemoryTraits::destroy(BufferParams::Impl * ptr)
+{
+ delete ptr;
+}
+
BufferParams::BufferParams()
- // Initialize textclass to point to article. if `first' is
- // true in the returned pair, then `second' is the textclass
- // number; if it is false, second is 0. In both cases, second
- // is what we want.
- : textclass(textclasslist.NumberOfClass("article").second)
+ : // Initialize textclass to point to article. if `first' is
+ // true in the returned pair, then `second' is the textclass
+ // number; if it is false, second is 0. In both cases, second
+ // is what we want.
+ textclass(textclasslist.NumberOfClass("article").second),
+ pimpl_(new Impl)
{
paragraph_separation = PARSEP_INDENT;
- defskip = VSpace(VSpace::MEDSKIP);
quotes_language = InsetQuotes::EnglishQ;
quotes_times = InsetQuotes::DoubleQ;
fontsize = "default";
orientation = ORIENTATION_PORTRAIT;
use_geometry = false;
use_amsmath = AMS_AUTO;
- use_natbib = false;
- use_numerical_citations = false;
+ cite_engine = biblio::ENGINE_BASIC;
+ use_bibtopic = false;
tracking_changes = false;
secnumdepth = 3;
tocdepth = 3;
pagestyle = "default";
compressed = false;
for (int iter = 0; iter < 4; ++iter) {
- user_defined_bullets[iter] = ITEMIZE_DEFAULTS[iter];
- temp_bullets[iter] = ITEMIZE_DEFAULTS[iter];
+ user_defined_bullet(iter) = ITEMIZE_DEFAULTS[iter];
+ temp_bullet(iter) = ITEMIZE_DEFAULTS[iter];
}
}
+BufferParams::~BufferParams()
+{}
+
+
+AuthorList & BufferParams::authors()
+{
+ return pimpl_->authorlist;
+}
+
+
+AuthorList const & BufferParams::authors() const
+{
+ return pimpl_->authorlist;
+}
+
+
+BranchList & BufferParams::branchlist()
+{
+ return pimpl_->branchlist;
+}
+
+
+BranchList const & BufferParams::branchlist() const
+{
+ return pimpl_->branchlist;
+}
+
+
+Bullet & BufferParams::temp_bullet(lyx::size_type index)
+{
+ BOOST_ASSERT(index < 4);
+ return pimpl_->temp_bullets[index];
+}
+
+
+Bullet const & BufferParams::temp_bullet(lyx::size_type index) const
+{
+ BOOST_ASSERT(index < 4);
+ return pimpl_->temp_bullets[index];
+}
+
+
+Bullet & BufferParams::user_defined_bullet(lyx::size_type index)
+{
+ BOOST_ASSERT(index < 4);
+ return pimpl_->user_defined_bullets[index];
+}
+
+
+Bullet const & BufferParams::user_defined_bullet(lyx::size_type index) const
+{
+ BOOST_ASSERT(index < 4);
+ return pimpl_->user_defined_bullets[index];
+}
+
+
+Spacing & BufferParams::spacing()
+{
+ return pimpl_->spacing;
+}
+
+
+Spacing const & BufferParams::spacing() const
+{
+ return pimpl_->spacing;
+}
+
+
+VSpace const & BufferParams::getDefSkip() const
+{
+ return pimpl_->defskip;
+}
+
+
+void BufferParams::setDefSkip(VSpace const & vs)
+{
+ pimpl_->defskip = vs;
+}
+
+
string const BufferParams::readToken(LyXLex & lex, string const & token)
{
if (token == "\\textclass") {
- lex.eatLine();
+ lex.next();
string const classname = lex.getString();
pair<bool, lyx::textclass_type> pp =
textclasslist.NumberOfClass(classname);
} else if (token == "\\language") {
readLanguage(lex);
} else if (token == "\\inputencoding") {
- lex.eatLine();
- inputenc = lex.getString();
+ lex >> inputenc;
} else if (token == "\\graphics") {
readGraphicsDriver(lex);
} else if (token == "\\fontscheme") {
- lex.eatLine();
- fonts = lex.getString();
+ lex >> fonts;
} else if (token == "\\paragraph_separation") {
- int tmpret = lex.findToken(string_paragraph_separation);
- if (tmpret == -1)
- ++tmpret;
- paragraph_separation =
- static_cast<PARSEP>(tmpret);
+ string parsep;
+ lex >> parsep;
+ paragraph_separation = parseptranslator().find(parsep);
} else if (token == "\\defskip") {
- lex.nextToken();
- defskip = VSpace(lex.getString());
+ lex.next();
+ pimpl_->defskip = VSpace(lex.getString());
} else if (token == "\\quotes_language") {
- // FIXME: should be params.readQuotes()
- int tmpret = lex.findToken(string_quotes_language);
- if (tmpret == -1)
- ++tmpret;
- InsetQuotes::quote_language tmpl =
- InsetQuotes::EnglishQ;
- switch (tmpret) {
- case 0:
- tmpl = InsetQuotes::EnglishQ;
- break;
- case 1:
- tmpl = InsetQuotes::SwedishQ;
- break;
- case 2:
- tmpl = InsetQuotes::GermanQ;
- break;
- case 3:
- tmpl = InsetQuotes::PolishQ;
- break;
- case 4:
- tmpl = InsetQuotes::FrenchQ;
- break;
- case 5:
- tmpl = InsetQuotes::DanishQ;
- break;
- }
- quotes_language = tmpl;
+ string quotes_lang;
+ lex >> quotes_lang;
+ quotes_language = quoteslangtranslator().find(quotes_lang);
} else if (token == "\\quotes_times") {
- // FIXME: should be params.readQuotes()
- lex.nextToken();
- switch (lex.getInteger()) {
- case 1:
- quotes_times = InsetQuotes::SingleQ;
- break;
- case 2:
- quotes_times = InsetQuotes::DoubleQ;
- break;
- }
+ int qtimes;
+ lex >> qtimes;
+ quotes_times = quotestimestranslator().find(qtimes);
} else if (token == "\\papersize") {
- int tmpret = lex.findToken(string_papersize);
- if (tmpret == -1)
- ++tmpret;
- else
- papersize2 = VMARGIN_PAPER_TYPE(tmpret);
+ string ppsize;
+ lex >> ppsize;
+ papersize2 = papersizetranslator().find(ppsize);
} else if (token == "\\paperpackage") {
- int tmpret = lex.findToken(string_paperpackages);
- if (tmpret == -1) {
- ++tmpret;
- paperpackage = PACKAGE_NONE;
- } else
- paperpackage = PAPER_PACKAGES(tmpret);
+ string ppackage;
+ lex >> ppackage;
+ paperpackage = paperpackagestranslator().find(ppackage);
} else if (token == "\\use_geometry") {
- lex.nextToken();
- use_geometry = lex.getInteger();
+ lex >> use_geometry;
} else if (token == "\\use_amsmath") {
- lex.nextToken();
- use_amsmath = static_cast<AMS>(
- lex.getInteger());
- } else if (token == "\\use_natbib") {
- lex.nextToken();
- use_natbib = lex.getInteger();
- } else if (token == "\\use_numerical_citations") {
- lex.nextToken();
- use_numerical_citations = lex.getInteger();
+ int use_ams;
+ lex >> use_ams;
+ use_amsmath = amstranslator().find(use_ams);
+ } else if (token == "\\cite_engine") {
+ string engine;
+ lex >> engine;
+ cite_engine = citeenginetranslator().find(engine);
+ } else if (token == "\\use_bibtopic") {
+ lex >> use_bibtopic;
} else if (token == "\\tracking_changes") {
- lex.nextToken();
- tracking_changes = lex.getInteger();
+ lex >> tracking_changes;
} else if (token == "\\branch") {
- lex.nextToken();
+ lex.next();
string branch = lex.getString();
- branchlist.add(branch);
+ branchlist().add(branch);
while (true) {
- lex.nextToken();
+ lex.next();
string const tok = lex.getString();
if (tok == "\\end_branch")
break;
+ Branch * branch_ptr = branchlist().find(branch);
if (tok == "\\selected") {
- lex.nextToken();
- branchlist.setSelected(branch, lex.getInteger());
+ lex.next();
+ if (branch_ptr)
+ branch_ptr->setSelected(lex.getInteger());
}
// not yet operational
if (tok == "\\color") {
- lex.nextToken();
+ lex.eatLine();
string color = lex.getString();
- branchlist.setColor(branch, color);
+ if (branch_ptr)
+ branch_ptr->setColor(color);
// Update also the LColor table:
- if (color == "none")
+ if (color == "none")
color = lcolor.getX11Name(LColor::background);
- lcolor.fill(static_cast<LColor::color>(lcolor.size()),
- branch, color);
+ lcolor.setColor(branch, color);
+
}
}
} else if (token == "\\author") {
- lex.nextToken();
- istringstream ss(STRCONV(lex.getString()));
+ lex.eatLine();
+ istringstream ss(lex.getString());
Author a;
ss >> a;
- author_map.push_back(authorlist.record(a));
+ author_map.push_back(pimpl_->authorlist.record(a));
} else if (token == "\\paperorientation") {
- int tmpret = lex.findToken(string_orientation);
- if (tmpret == -1)
- ++tmpret;
- orientation =
- static_cast<PAPER_ORIENTATION>(tmpret);
+ string orient;
+ lex >> orient;
+ orientation = paperorientationtranslator().find(orient);
} else if (token == "\\paperwidth") {
- lex.next();
- paperwidth = lex.getString();
+ lex >> paperwidth;
} else if (token == "\\paperheight") {
- lex.next();
- paperheight = lex.getString();
+ lex >> paperheight;
} else if (token == "\\leftmargin") {
- lex.next();
- leftmargin = lex.getString();
+ lex >> leftmargin;
} else if (token == "\\topmargin") {
- lex.next();
- topmargin = lex.getString();
+ lex >> topmargin;
} else if (token == "\\rightmargin") {
- lex.next();
- rightmargin = lex.getString();
+ lex >> rightmargin;
} else if (token == "\\bottommargin") {
- lex.next();
- bottommargin = lex.getString();
+ lex >> bottommargin;
} else if (token == "\\headheight") {
- lex.next();
- headheight = lex.getString();
+ lex >> headheight;
} else if (token == "\\headsep") {
- lex.next();
- headsep = lex.getString();
+ lex >> headsep;
} else if (token == "\\footskip") {
- lex.next();
- footskip = lex.getString();
+ lex >> footskip;
} else if (token == "\\paperfontsize") {
- lex.nextToken();
- fontsize = rtrim(lex.getString());
+ lex >> fontsize;
} else if (token == "\\papercolumns") {
- lex.nextToken();
- columns = lex.getInteger();
+ lex >> columns;
} else if (token == "\\papersides") {
- lex.nextToken();
- switch (lex.getInteger()) {
- default:
- case 1: sides = LyXTextClass::OneSide; break;
- case 2: sides = LyXTextClass::TwoSides; break;
- }
+ int psides;
+ lex >> psides;
+ sides = sidestranslator().find(psides);
} else if (token == "\\paperpagestyle") {
- lex.nextToken();
- pagestyle = rtrim(lex.getString());
+ lex >> pagestyle;
} else if (token == "\\bullet") {
- // FIXME: should be params.readBullets()
- lex.nextToken();
- int const index = lex.getInteger();
- lex.nextToken();
- int temp_int = lex.getInteger();
- user_defined_bullets[index].setFont(temp_int);
- temp_bullets[index].setFont(temp_int);
- lex.nextToken();
- temp_int = lex.getInteger();
- user_defined_bullets[index].setCharacter(temp_int);
- temp_bullets[index].setCharacter(temp_int);
- lex.nextToken();
- temp_int = lex.getInteger();
- user_defined_bullets[index].setSize(temp_int);
- temp_bullets[index].setSize(temp_int);
- lex.nextToken();
- string const temp_str = lex.getString();
- if (temp_str != "\\end_bullet") {
- // this element isn't really necessary for
- // parsing but is easier for humans
- // to understand bullets. Put it back and
- // set a debug message?
- lex.printError("\\end_bullet expected, got" + temp_str);
- //how can I put it back?
- }
+ readBullets(lex);
} else if (token == "\\bulletLaTeX") {
- // The bullet class should be able to read this.
- lex.nextToken();
- int const index = lex.getInteger();
- lex.next();
- string temp_str = lex.getString();
- string sum_str;
- while (temp_str != "\\end_bullet") {
- // this loop structure is needed when user
- // enters an empty string since the first
- // thing returned will be the \\end_bullet
- // OR
- // if the LaTeX entry has spaces. Each element
- // therefore needs to be read in turn
- sum_str += temp_str;
- lex.next();
- temp_str = lex.getString();
- }
-
- user_defined_bullets[index].setText(sum_str);
- temp_bullets[index].setText(sum_str);
+ readBulletsLaTeX(lex);
} else if (token == "\\secnumdepth") {
- lex.nextToken();
- secnumdepth = lex.getInteger();
+ lex >> secnumdepth;
} else if (token == "\\tocdepth") {
- lex.nextToken();
- tocdepth = lex.getInteger();
+ lex >> tocdepth;
} else if (token == "\\spacing") {
- lex.next();
- string const tmp = rtrim(lex.getString());
- Spacing::Space tmp_space = Spacing::Default;
+ string nspacing;
+ lex >> nspacing;
float tmp_val = 0.0;
- if (tmp == "single") {
- tmp_space = Spacing::Single;
- } else if (tmp == "onehalf") {
- tmp_space = Spacing::Onehalf;
- } else if (tmp == "double") {
- tmp_space = Spacing::Double;
- } else if (tmp == "other") {
- lex.next();
- tmp_space = Spacing::Other;
- tmp_val = lex.getFloat();
- } else {
- lex.printError("Unknown spacing token: '$$Token'");
+ if (nspacing == "other") {
+ lex >> tmp_val;
}
-#if 0 // FIXME: Handled in lyx2lyx ?
- // Small hack so that files written with klyx will be
- // parsed correctly.
- if (first_par)
- par->params().spacing(Spacing(tmp_space, tmp_val));
-#endif
- spacing.set(tmp_space, tmp_val);
+ spacing().set(spacetranslator().find(nspacing), tmp_val);
} else if (token == "\\float_placement") {
- lex.nextToken();
- float_placement = lex.getString();
+ lex >> float_placement;
} else {
return token;
}
}
os << "\\paperfontsize " << fontsize << '\n';
- spacing.writeFile(os);
+ spacing().writeFile(os);
os << "\\papersize " << string_papersize[papersize2]
<< "\n\\paperpackage " << string_paperpackages[paperpackage]
<< "\n\\use_geometry " << use_geometry
<< "\n\\use_amsmath " << use_amsmath
- << "\n\\use_natbib " << use_natbib
- << "\n\\use_numerical_citations " << use_numerical_citations
+ << "\n\\cite_engine " << citeenginetranslator().find(cite_engine)
+ << "\n\\use_bibtopic " << use_bibtopic
<< "\n\\paperorientation " << string_orientation[orientation]
<< '\n';
- std::list<Branch>::const_iterator it = branchlist.begin();
- std::list<Branch>::const_iterator end = branchlist.end();
+ std::list<Branch>::const_iterator it = branchlist().begin();
+ std::list<Branch>::const_iterator end = branchlist().end();
for (; it != end; ++it) {
os << "\\branch " << it->getBranch()
- << "\n\\selected " << it->getSelected()
- << "\n\\color " << it->getColor()
- << "\n\\end_branch"
+ << "\n\\selected " << it->getSelected()
+ << "\n\\color " << it->getColor()
+ << "\n\\end_branch"
<< "\n";
}
<< "\n\\tocdepth " << tocdepth
<< "\n\\paragraph_separation "
<< string_paragraph_separation[paragraph_separation]
- << "\n\\defskip " << defskip.asLyXCommand()
+ << "\n\\defskip " << getDefSkip().asLyXCommand()
<< "\n\\quotes_language "
- << string_quotes_language[quotes_language] << '\n';
- switch (quotes_times) {
- // An output operator for insetquotes would be nice
- case InsetQuotes::SingleQ:
- os << "\\quotes_times 1\n"; break;
- case InsetQuotes::DoubleQ:
- os << "\\quotes_times 2\n"; break;
- }
- os << "\\papercolumns " << columns
+ << string_quotes_language[quotes_language] << '\n'
+ << "\\quotes_times "
+ << quotestimestranslator().find(quotes_times)
+ << "\n\\papercolumns " << columns
<< "\n\\papersides " << sides
<< "\n\\paperpagestyle " << pagestyle << '\n';
for (int i = 0; i < 4; ++i) {
- if (user_defined_bullets[i] != ITEMIZE_DEFAULTS[i]) {
- if (user_defined_bullets[i].getFont() != -1) {
- os << "\\bullet " << i
- << "\n\t"
- << user_defined_bullets[i].getFont()
- << "\n\t"
- << user_defined_bullets[i].getCharacter()
- << "\n\t"
- << user_defined_bullets[i].getSize()
- << "\n\\end_bullet\n";
+ if (user_defined_bullet(i) != ITEMIZE_DEFAULTS[i]) {
+ if (user_defined_bullet(i).getFont() != -1) {
+ os << "\\bullet " << i << " "
+ << user_defined_bullet(i).getFont() << " "
+ << user_defined_bullet(i).getCharacter() << " "
+ << user_defined_bullet(i).getSize() << "\n";
}
else {
- os << "\\bulletLaTeX " << i
- << "\n\t\""
- << user_defined_bullets[i].getText()
- << "\"\n\\end_bullet\n";
+ os << "\\bulletLaTeX " << i << " \""
+ << user_defined_bullet(i).getText()
+ << "\"\n";
}
}
}
os << "\\tracking_changes " << tracking_changes << "\n";
if (tracking_changes) {
- AuthorList::Authors::const_iterator it = authorlist.begin();
- AuthorList::Authors::const_iterator end = authorlist.end();
+ AuthorList::Authors::const_iterator it = pimpl_->authorlist.begin();
+ AuthorList::Authors::const_iterator end = pimpl_->authorlist.end();
for (; it != end; ++it) {
os << "\\author " << it->second << "\n";
}
clsoptions << options << ',';
}
- string strOptions(STRCONV(clsoptions.str()));
+ string strOptions(clsoptions.str());
if (!strOptions.empty()) {
strOptions = rtrim(strOptions, ",");
os << '[' << strOptions << ']';
}
if (paragraph_separation) {
- switch (defskip.kind()) {
+ switch (getDefSkip().kind()) {
case VSpace::SMALLSKIP:
os << "\\setlength\\parskip{\\smallskipamount}\n";
break;
break;
case VSpace::LENGTH:
os << "\\setlength\\parskip{"
- << defskip.length().asLatexString()
+ << getDefSkip().length().asLatexString()
<< "}\n";
break;
default: // should never happen // Then delete it.
texrow.newline();
}
+ // If we use jurabib, we have to call babel here.
+ if (use_babel && features.isRequired("jurabib")) {
+ os << babelCall(language_options.str())
+ << '\n'
+ << features.getBabelOptions();
+ texrow.newline();
+ }
+
// Now insert the LyX specific LaTeX commands...
// The optional packages;
// at \begin{document} time -- JMarc
string bullets_def;
for (int i = 0; i < 4; ++i) {
- if (user_defined_bullets[i] != ITEMIZE_DEFAULTS[i]) {
+ if (user_defined_bullet(i) != ITEMIZE_DEFAULTS[i]) {
if (bullets_def.empty())
bullets_def="\\AtBeginDocument{\n";
bullets_def += " \\renewcommand{\\labelitemi";
break;
}
bullets_def += "}{" +
- user_defined_bullets[i].getText()
+ user_defined_bullet(i).getText()
+ "}\n";
}
}
// We try to load babel late, in case it interferes
// with other packages.
- if (use_babel) {
- string tmp = lyxrc.language_package;
- if (!lyxrc.language_global_options
- && tmp == "\\usepackage{babel}")
- tmp = string("\\usepackage[") +
- STRCONV(language_options.str()) +
- "]{babel}";
- lyxpreamble += tmp + "\n";
+ // Jurabib has to be called after babel, though.
+ if (use_babel && !features.isRequired("jurabib")) {
+ lyxpreamble += babelCall(language_options.str()) + '\n';
lyxpreamble += features.getBabelOptions();
}
"\\dvipost{osstart color push Red}\n"
"\\dvipost{osend color pop}\n"
"\\dvipost{cbstart color push Blue}\n"
- "\\dvipost{cbend color pop} \n";
+ "\\dvipost{cbend color pop}\n";
}
int const nlines =
}
+void BufferParams::readBullets(LyXLex & lex)
+{
+ if (!lex.next()) return;
+
+ int const index = lex.getInteger();
+ lex.next();
+ int temp_int = lex.getInteger();
+ user_defined_bullet(index).setFont(temp_int);
+ temp_bullet(index).setFont(temp_int);
+ lex >> temp_int;
+ user_defined_bullet(index).setCharacter(temp_int);
+ temp_bullet(index).setCharacter(temp_int);
+ lex >> temp_int;
+ user_defined_bullet(index).setSize(temp_int);
+ temp_bullet(index).setSize(temp_int);
+}
+
+
+void BufferParams::readBulletsLaTeX(LyXLex & lex)
+{
+ // The bullet class should be able to read this.
+ if (!lex.next()) return;
+ int const index = lex.getInteger();
+ lex.next(true);
+ string temp_str = lex.getString();
+
+ user_defined_bullet(index).setText(temp_str);
+ temp_bullet(index).setText(temp_str);
+}
+
+
string const BufferParams::paperSizeName() const
{
char real_papersize = papersize;
result += ' ' + lyxrc.print_landscape_flag;
return result;
}
+
+
+string const BufferParams::babelCall(string const & lang_opts) const
+{
+ string tmp = lyxrc.language_package;
+ if (!lyxrc.language_global_options && tmp == "\\usepackage{babel}")
+ tmp = string("\\usepackage[") + lang_opts + "]{babel}";
+ return tmp;
+}