X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiDocument.cpp;h=71eff5b92c4de5481598a5698cfeff0c97e8e8c4;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=5d126f5e357002c7acfa6551d778c6b858b815cc;hpb=3e4170457966a94ca9ea873dd6d4aec141994edd;p=lyx.git

diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index 5d126f5e35..71eff5b92c 100644
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -15,6 +15,7 @@
 
 #include "GuiApplication.h"
 #include "GuiBranches.h"
+#include "GuiIndices.h"
 #include "GuiSelectionManager.h"
 #include "LaTeXHighlighter.h"
 #include "LengthCombo.h"
@@ -28,13 +29,18 @@
 #include "BufferParams.h"
 #include "BufferView.h"
 #include "Color.h"
+#include "ColorCache.h"
 #include "Encoding.h"
 #include "FloatPlacement.h"
+#include "Format.h"
 #include "FuncRequest.h"
+#include "HSpace.h"
+#include "IndicesList.h"
 #include "Language.h"
 #include "LaTeXFeatures.h"
 #include "Layout.h"
-#include "LyXRC.h" // defaultUnit
+#include "LayoutModuleList.h"
+#include "LyXRC.h"
 #include "ModuleList.h"
 #include "OutputParams.h"
 #include "PDFOptions.h"
@@ -52,7 +58,11 @@
 #include "frontends/alert.h"
 
 #include <QAbstractItemModel>
+#include <QHeaderView>
+#include <QColor>
+#include <QColorDialog>
 #include <QCloseEvent>
+#include <QFontDatabase>
 #include <QScrollBar>
 #include <QTextCursor>
 
@@ -64,6 +74,19 @@
 #endif
 
 
+// a style sheet for buttons
+// this is for example used for the background color setting button
+static inline QString colorButtonStyleSheet(QColor const & bgColor)
+{
+	if (bgColor.isValid()) {
+		QString rc = QLatin1String("background:");
+		rc += bgColor.name();
+		return rc;
+	}
+	return QString();
+}
+
+
 using namespace std;
 using namespace lyx::support;
 
@@ -154,6 +177,8 @@ vector<pair<string, QString> > pagestyles;
 
 namespace lyx {
 
+RGBColor set_backgroundcolor;
+
 namespace {
 // used when sorting the textclass list.
 class less_textclass_avail_desc
@@ -167,9 +192,11 @@ public:
 		//   2. Description (lexicographic)
 		LayoutFile const & tc1 = LayoutFileList::get()[lhs];
 		LayoutFile const & tc2 = LayoutFileList::get()[rhs];
+		int const order = compare_no_case(
+			translateIfPossible(from_utf8(tc1.description())),
+			translateIfPossible(from_utf8(tc2.description())));
 		return (tc1.isTeXClassAvailable() && !tc2.isTeXClassAvailable()) ||
-			(tc1.isTeXClassAvailable() == tc2.isTeXClassAvailable() &&
-			 _(tc1.description()) < _(tc2.description()));
+			(tc1.isTeXClassAvailable() == tc2.isTeXClassAvailable() && order < 0);
 	}
 };
 
@@ -180,7 +207,7 @@ namespace {
 
 vector<string> getRequiredList(string const & modName) 
 {
-	LyXModule const * const mod = moduleList[modName];
+	LyXModule const * const mod = theModuleList[modName];
 	if (!mod)
 		return vector<string>(); //empty such thing
 	return mod->getRequiredModules();
@@ -189,7 +216,7 @@ vector<string> getRequiredList(string const & modName)
 
 vector<string> getExcludedList(string const & modName)
 {
-	LyXModule const * const mod = moduleList[modName];
+	LyXModule const * const mod = theModuleList[modName];
 	if (!mod)
 		return vector<string>(); //empty such thing
 	return mod->getExcludedModules();
@@ -198,16 +225,17 @@ vector<string> getExcludedList(string const & modName)
 
 docstring getModuleDescription(string const & modName)
 {
-	LyXModule const * const mod = moduleList[modName];
+	LyXModule const * const mod = theModuleList[modName];
 	if (!mod)
 		return _("Module not found!");
-	return _(mod->getDescription());
+	// FIXME Unicode
+	return translateIfPossible(from_utf8(mod->getDescription()));
 }
 
 
 vector<string> getPackageList(string const & modName)
 {
-	LyXModule const * const mod = moduleList[modName];
+	LyXModule const * const mod = theModuleList[modName];
 	if (!mod)
 		return vector<string>(); //empty such thing
 	return mod->getPackageList();
@@ -216,7 +244,7 @@ vector<string> getPackageList(string const & modName)
 
 bool isModuleAvailable(string const & modName)
 {
-	LyXModule * mod = moduleList[modName];
+	LyXModule const * const mod = theModuleList[modName];
 	if (!mod)
 		return false;
 	return mod->isAvailable();
@@ -237,17 +265,24 @@ class ModuleSelectionManager : public GuiSelectionManager
 public:
 	///
 	ModuleSelectionManager(
-		QListView * availableLV, 
+		QTreeView * availableLV,
 		QListView * selectedLV,
 		QPushButton * addPB, 
 		QPushButton * delPB, 
 		QPushButton * upPB, 
 		QPushButton * downPB,
 		GuiIdListModel * availableModel,
-		GuiIdListModel * selectedModel)
+		GuiIdListModel * selectedModel,
+		GuiDocument const * container)
 	: GuiSelectionManager(availableLV, selectedLV, addPB, delPB,
-                        upPB, downPB, availableModel, selectedModel)
+				upPB, downPB, availableModel, selectedModel), container_(container)
 		{}
+	///
+	void updateProvidedModules(LayoutModuleList const & pm) 
+			{ provided_modules_ = pm.list(); }
+	///
+	void updateExcludedModules(LayoutModuleList const & em) 
+			{ excluded_modules_ = em.list(); }
 private:
 	///
 	virtual void updateAddPB();
@@ -267,66 +302,33 @@ private:
 	{
 		return dynamic_cast<GuiIdListModel *>(selectedModel);
 	}
+	/// keeps a list of the modules the text class provides
+	list<string> provided_modules_;
+	/// similarly...
+	list<string> excluded_modules_;
+	/// 
+	GuiDocument const * container_;
 };
 
 void ModuleSelectionManager::updateAddPB() 
 {
 	int const arows = availableModel->rowCount();
-	QModelIndexList const availSels = 
+	QModelIndexList const avail_sels = 
 			availableLV->selectionModel()->selectedIndexes();
-	if (arows == 0 || availSels.isEmpty()  || isSelected(availSels.first())) {
+
+	// disable if there aren't any modules (?), if none of them is chosen
+	// in the dialog, or if the chosen one is already selected for use.
+	if (arows == 0 || avail_sels.isEmpty() || isSelected(avail_sels.first())) {
 		addPB->setEnabled(false);
 		return;
 	}
-	
-	QModelIndex const & idx = availableLV->selectionModel()->currentIndex();
-	string const modName = getAvailableModel()->getIDString(idx.row());
-	vector<string> const reqs = getRequiredList(modName);
-	vector<string> const excl = getExcludedList(modName);
-	
-	if (reqs.empty() && excl.empty()) {
-		addPB->setEnabled(true);
-		return;
-	}
 
-	int const srows = selectedModel->rowCount();
-	vector<string> selModList;
-	for (int i = 0; i < srows; ++i)
-		selModList.push_back(getSelectedModel()->getIDString(i));
-
-	vector<string>::const_iterator const selModStart = selModList.begin();
-	vector<string>::const_iterator const selModEnd   = selModList.end();
-	
-	// Check whether some required module is available
-	if (!reqs.empty()) {
-		bool foundOne = false;
-		vector<string>::const_iterator it = reqs.begin();
-		vector<string>::const_iterator en = reqs.end();
-		for (; it != en; ++it) {
-			if (find(selModStart, selModEnd, *it) != selModEnd) {
-				foundOne = true;
-				break;
-			}
-		}
-		if (!foundOne) {
-			addPB->setEnabled(false);
-			return;
-		}
-	}
-	
-	// Check whether any excluded module is being used
-	if (!excl.empty()) {
-		vector<string>::const_iterator it = excl.begin();
-		vector<string>::const_iterator en = excl.end();
-		for (; it != en; ++it) {
-			if (find(selModStart, selModEnd, *it) != selModEnd) {
-				addPB->setEnabled(false);
-				return;
-			}
-		}
-	}
+	QModelIndex const & idx = availableLV->selectionModel()->currentIndex();
+	string const modname = getAvailableModel()->getIDString(idx.row());
 
-	addPB->setEnabled(true);
+	bool const enable = 
+		container_->params().moduleCanBeAdded(modname);
+	addPB->setEnabled(enable);
 }
 
 
@@ -337,18 +339,18 @@ void ModuleSelectionManager::updateDownPB()
 		downPB->setEnabled(false);
 		return;
 	}
-	QModelIndex const & curIdx = selectedLV->selectionModel()->currentIndex();
-	int const curRow = curIdx.row();
+	QModelIndex const & curidx = selectedLV->selectionModel()->currentIndex();
+	int const curRow = curidx.row();
 	if (curRow < 0 || curRow >= srows - 1) { // invalid or last item
 		downPB->setEnabled(false);
 		return;
 	}
 
 	// determine whether immediately succeding element requires this one
-	string const curModName = getSelectedModel()->getIDString(curRow);
-	string const nextModName = getSelectedModel()->getIDString(curRow + 1);
+	string const curmodname = getSelectedModel()->getIDString(curRow);
+	string const nextmodname = getSelectedModel()->getIDString(curRow + 1);
 
-	vector<string> reqs = getRequiredList(nextModName);
+	vector<string> reqs = getRequiredList(nextmodname);
 
 	// if it doesn't require anything....
 	if (reqs.empty()) {
@@ -360,7 +362,7 @@ void ModuleSelectionManager::updateDownPB()
 	// FIXME This should perhaps be more flexible and check whether, even 
 	// if the next one is required, there is also an earlier one that will do.
 	downPB->setEnabled(
-			find(reqs.begin(), reqs.end(), curModName) == reqs.end());
+			find(reqs.begin(), reqs.end(), curmodname) == reqs.end());
 }
 
 void ModuleSelectionManager::updateUpPB() 
@@ -377,10 +379,10 @@ void ModuleSelectionManager::updateUpPB()
 		upPB->setEnabled(false);
 		return;
 	}
-	string const curModName = getSelectedModel()->getIDString(curRow);
+	string const curmodname = getSelectedModel()->getIDString(curRow);
 
 	// determine whether immediately preceding element is required by this one
-	vector<string> reqs = getRequiredList(curModName);
+	vector<string> reqs = getRequiredList(curmodname);
 
 	// if this one doesn't require anything....
 	if (reqs.empty()) {
@@ -392,8 +394,8 @@ void ModuleSelectionManager::updateUpPB()
 	// Enable it if the preceding module isn't required.
 	// NOTE This is less flexible than it might be. We could check whether, even 
 	// if the previous one is required, there is an earlier one that would do.
-	string const preModName = getSelectedModel()->getIDString(curRow - 1);
-	upPB->setEnabled(find(reqs.begin(), reqs.end(), preModName) == reqs.end());
+	string const premod = getSelectedModel()->getIDString(curRow - 1);
+	upPB->setEnabled(find(reqs.begin(), reqs.end(), premod) == reqs.end());
 }
 
 void ModuleSelectionManager::updateDelPB() 
@@ -403,16 +405,16 @@ void ModuleSelectionManager::updateDelPB()
 		deletePB->setEnabled(false);
 		return;
 	}
-	
-	QModelIndex const & curIdx = 
+
+	QModelIndex const & curidx = 
 		selectedLV->selectionModel()->currentIndex();
-	int const curRow = curIdx.row();
+	int const curRow = curidx.row();
 	if (curRow < 0 || curRow >= srows) { // invalid index?
 		deletePB->setEnabled(false);
 		return;
 	}
 
-	string const curModName = getSelectedModel()->getIDString(curRow);
+	string const curmodname = getSelectedModel()->getIDString(curRow);
 
 	// We're looking here for a reason NOT to enable the button. If we
 	// find one, we disable it and return. If we don't, we'll end up at
@@ -421,7 +423,7 @@ void ModuleSelectionManager::updateDelPB()
 		string const thisMod = getSelectedModel()->getIDString(i);
 		vector<string> reqs = getRequiredList(thisMod);
 		//does this one require us?
-		if (find(reqs.begin(), reqs.end(), curModName) == reqs.end())
+		if (find(reqs.begin(), reqs.end(), curmodname) == reqs.end())
 			//no...
 			continue;
 
@@ -432,26 +434,26 @@ void ModuleSelectionManager::updateDelPB()
 		// required module. There would be more flexible ways to proceed,
 		// but that would be a lot more complicated, and the logic here is
 		// already complicated. (That's why I've left the debugging code.)
-		// lyxerr << "Testing " << thisMod << std::endl;
-		bool foundOne = false;
+		// lyxerr << "Testing " << thisMod << endl;
+		bool foundone = false;
 		for (int j = 0; j < curRow; ++j) {
 			string const mod = getSelectedModel()->getIDString(j);
-			// lyxerr << "In loop: Testing " << mod << std::endl;
+			// lyxerr << "In loop: Testing " << mod << endl;
 			// do we satisfy the require? 
 			if (find(reqs.begin(), reqs.end(), mod) != reqs.end()) {
-				// lyxerr << mod << " does the trick." << std::endl;
-				foundOne = true;
+				// lyxerr << mod << " does the trick." << endl;
+				foundone = true;
 				break;
 			}
 		}
 		// did we find a module to satisfy the require?
-		if (!foundOne) {
-			// lyxerr << "No matching module found." << std::endl;
+		if (!foundone) {
+			// lyxerr << "No matching module found." << endl;
 			deletePB->setEnabled(false);
 			return;
 		}
 	}
-	// lyxerr << "All's well that ends well." << std::endl;	
+	// lyxerr << "All's well that ends well." << endl;
 	deletePB->setEnabled(true);
 }
 
@@ -553,45 +555,56 @@ GuiDocument::GuiDocument(GuiView & lv)
 		this, SLOT(setLSpacing(int)));
 	connect(textLayoutModule->lspacingLE, SIGNAL(textChanged(const QString &)),
 		this, SLOT(change_adaptor()));
-	connect(textLayoutModule->skipRB, SIGNAL(clicked()),
-		this, SLOT(change_adaptor()));
+
 	connect(textLayoutModule->indentRB, SIGNAL(clicked()),
 		this, SLOT(change_adaptor()));
+	connect(textLayoutModule->indentRB, SIGNAL(toggled(bool)),
+		textLayoutModule->indentCO, SLOT(setEnabled(bool)));
+	connect(textLayoutModule->indentCO, SIGNAL(activated(int)),
+		this, SLOT(change_adaptor()));
+	connect(textLayoutModule->indentCO, SIGNAL(activated(int)),
+		this, SLOT(setIndent(int)));
+	connect(textLayoutModule->indentLE, SIGNAL(textChanged(const QString &)),
+		this, SLOT(change_adaptor()));
+	connect(textLayoutModule->indentLengthCO, SIGNAL(activated(int)),
+		this, SLOT(change_adaptor()));
+
+	connect(textLayoutModule->skipRB, SIGNAL(clicked()),
+		this, SLOT(change_adaptor()));
+	connect(textLayoutModule->skipRB, SIGNAL(toggled(bool)),
+		textLayoutModule->skipCO, SLOT(setEnabled(bool)));
 	connect(textLayoutModule->skipCO, SIGNAL(activated(int)),
 		this, SLOT(change_adaptor()));
+	connect(textLayoutModule->skipCO, SIGNAL(activated(int)),
+		this, SLOT(setSkip(int)));
 	connect(textLayoutModule->skipLE, SIGNAL(textChanged(const QString &)),
 		this, SLOT(change_adaptor()));
 	connect(textLayoutModule->skipLengthCO, SIGNAL(activated(int)),
 		this, SLOT(change_adaptor()));
-	connect(textLayoutModule->skipCO, SIGNAL(activated(int)),
-		this, SLOT(setSkip(int)));
+
+	connect(textLayoutModule->indentRB, SIGNAL(toggled(bool)),
+		this, SLOT(enableIndent(bool)));
 	connect(textLayoutModule->skipRB, SIGNAL(toggled(bool)),
 		this, SLOT(enableSkip(bool)));
+
 	connect(textLayoutModule->twoColumnCB, SIGNAL(clicked()),
 		this, SLOT(change_adaptor()));
 	connect(textLayoutModule->twoColumnCB, SIGNAL(clicked()),
 		this, SLOT(setColSep()));
-	connect(textLayoutModule->listingsED, SIGNAL(textChanged()),
-		this, SLOT(change_adaptor()));
-	connect(textLayoutModule->bypassCB, SIGNAL(clicked()), 
-		this, SLOT(change_adaptor()));
-	connect(textLayoutModule->bypassCB, SIGNAL(clicked()), 
-		this, SLOT(setListingsMessage()));
-	connect(textLayoutModule->listingsED, SIGNAL(textChanged()),
-		this, SLOT(setListingsMessage()));
-	textLayoutModule->listingsTB->setPlainText(
-		qt_("Input listings parameters on the right. Enter ? for a list of parameters."));
+
 	textLayoutModule->lspacingLE->setValidator(new QDoubleValidator(
 		textLayoutModule->lspacingLE));
-	textLayoutModule->skipLE->setValidator(unsignedLengthValidator(
+	textLayoutModule->indentLE->setValidator(unsignedLengthValidator(
+		textLayoutModule->indentLE));
+	textLayoutModule->skipLE->setValidator(unsignedGlueLengthValidator(
 		textLayoutModule->skipLE));
 
+	textLayoutModule->indentCO->addItem(qt_("Default"));
+	textLayoutModule->indentCO->addItem(qt_("Custom"));
 	textLayoutModule->skipCO->addItem(qt_("SmallSkip"));
 	textLayoutModule->skipCO->addItem(qt_("MedSkip"));
 	textLayoutModule->skipCO->addItem(qt_("BigSkip"));
-	textLayoutModule->skipCO->addItem(qt_("Length"));
-	// remove the %-items from the unit choice
-	textLayoutModule->skipLengthCO->noPercents();
+	textLayoutModule->skipCO->addItem(qt_("Custom"));
 	textLayoutModule->lspacingCO->insertItem(
 		Spacing::Single, qt_("Single"));
 	textLayoutModule->lspacingCO->insertItem(
@@ -600,12 +613,43 @@ GuiDocument::GuiDocument(GuiView & lv)
 		Spacing::Double, qt_("Double"));
 	textLayoutModule->lspacingCO->insertItem(
 		Spacing::Other, qt_("Custom"));
-
 	// initialize the length validator
+	bc().addCheckedLineEdit(textLayoutModule->indentLE);
 	bc().addCheckedLineEdit(textLayoutModule->skipLE);
 
-	fontModule = new UiWidget<Ui::FontUi>;
+	// master/child handling
+	masterChildModule = new UiWidget<Ui::MasterChildUi>;
+
+	connect(masterChildModule->childrenTW, SIGNAL(itemDoubleClicked(QTreeWidgetItem *, int)),
+		this, SLOT(includeonlyClicked(QTreeWidgetItem *, int)));
+	connect(masterChildModule->includeonlyRB, SIGNAL(toggled(bool)),
+		masterChildModule->childrenTW, SLOT(setEnabled(bool)));
+	connect(masterChildModule->includeonlyRB, SIGNAL(toggled(bool)),
+		masterChildModule->maintainAuxCB, SLOT(setEnabled(bool)));
+	connect(masterChildModule->includeallRB, SIGNAL(clicked()),
+		this, SLOT(change_adaptor()));
+	connect(masterChildModule->includeonlyRB, SIGNAL(clicked()),
+		this, SLOT(change_adaptor()));
+	connect(masterChildModule->maintainAuxCB, SIGNAL(clicked()),
+		this, SLOT(change_adaptor()));
+	masterChildModule->childrenTW->setColumnCount(2);
+	masterChildModule->childrenTW->headerItem()->setText(0, qt_("Child Document"));
+	masterChildModule->childrenTW->headerItem()->setText(1, qt_("Include to Output"));
+	masterChildModule->childrenTW->resizeColumnToContents(1);
+	masterChildModule->childrenTW->resizeColumnToContents(2);
+
+	// output
+	outputModule = new UiWidget<Ui::OutputUi>;
+
+	connect(outputModule->xetexCB, SIGNAL(clicked()),
+		this, SLOT(change_adaptor()));
+	connect(outputModule->xetexCB, SIGNAL(toggled(bool)),
+		this, SLOT(xetexChanged(bool)));
+	connect(outputModule->defaultFormatCO, SIGNAL(activated(int)),
+		this, SLOT(change_adaptor()));
+
 	// fonts
+	fontModule = new UiWidget<Ui::FontUi>;
 	connect(fontModule->fontsRomanCO, SIGNAL(activated(int)),
 		this, SLOT(change_adaptor()));
 	connect(fontModule->fontsRomanCO, SIGNAL(activated(int)),
@@ -620,6 +664,12 @@ GuiDocument::GuiDocument(GuiView & lv)
 		this, SLOT(ttChanged(int)));
 	connect(fontModule->fontsDefaultCO, SIGNAL(activated(int)),
 		this, SLOT(change_adaptor()));
+	connect(fontModule->fontencCO, SIGNAL(activated(int)),
+		this, SLOT(change_adaptor()));
+	connect(fontModule->fontencCO, SIGNAL(activated(int)),
+		this, SLOT(fontencChanged(int)));
+	connect(fontModule->fontencLE, SIGNAL(textChanged(const QString &)),
+		this, SLOT(change_adaptor()));
 	connect(fontModule->fontsizeCO, SIGNAL(activated(int)),
 		this, SLOT(change_adaptor()));
 	connect(fontModule->cjkFontLE, SIGNAL(textChanged(const QString &)),
@@ -633,30 +683,17 @@ GuiDocument::GuiDocument(GuiView & lv)
 	connect(fontModule->fontOsfCB, SIGNAL(clicked()),
 		this, SLOT(change_adaptor()));
 
-	for (int n = 0; tex_fonts_roman[n][0]; ++n) {
-		QString font = qt_(tex_fonts_roman_gui[n]);
-		if (!isFontAvailable(tex_fonts_roman[n]))
-			font += qt_(" (not installed)");
-		fontModule->fontsRomanCO->addItem(font);
-	}
-	for (int n = 0; tex_fonts_sans[n][0]; ++n) {
-		QString font = qt_(tex_fonts_sans_gui[n]);
-		if (!isFontAvailable(tex_fonts_sans[n]))
-			font += qt_(" (not installed)");
-		fontModule->fontsSansCO->addItem(font);
-	}
-	for (int n = 0; tex_fonts_monospaced[n][0]; ++n) {
-		QString font = qt_(tex_fonts_monospaced_gui[n]);
-		if (!isFontAvailable(tex_fonts_monospaced[n]))
-			font += qt_(" (not installed)");
-		fontModule->fontsTypewriterCO->addItem(font);
-	}
+	updateFontlist();
 
 	fontModule->fontsizeCO->addItem(qt_("Default"));
 	fontModule->fontsizeCO->addItem(qt_("10"));
 	fontModule->fontsizeCO->addItem(qt_("11"));
 	fontModule->fontsizeCO->addItem(qt_("12"));
 
+	fontModule->fontencCO->addItem(qt_("Default"));
+	fontModule->fontencCO->addItem(qt_("Custom"));
+	fontModule->fontencCO->addItem(qt_("None (no fontenc)"));
+
 	for (int n = 0; GuiDocument::fontfamilies_gui[n][0]; ++n)
 		fontModule->fontsDefaultCO->addItem(
 			qt_(GuiDocument::fontfamilies_gui[n]));
@@ -665,9 +702,9 @@ GuiDocument::GuiDocument(GuiView & lv)
 	pageLayoutModule = new UiWidget<Ui::PageLayoutUi>;
 	// page layout
 	connect(pageLayoutModule->papersizeCO, SIGNAL(activated(int)),
-		this, SLOT(setCustomPapersize(int)));
+		this, SLOT(papersizeChanged(int)));
 	connect(pageLayoutModule->papersizeCO, SIGNAL(activated(int)),
-		this, SLOT(setCustomPapersize(int)));
+		this, SLOT(papersizeChanged(int)));
 	connect(pageLayoutModule->portraitRB, SIGNAL(clicked()),
 		this, SLOT(portraitChanged()));
 	connect(pageLayoutModule->papersizeCO, SIGNAL(activated(int)),
@@ -688,6 +725,10 @@ GuiDocument::GuiDocument(GuiView & lv)
 		this, SLOT(change_adaptor()));
 	connect(pageLayoutModule->pagestyleCO, SIGNAL(activated(int)),
 		this, SLOT(change_adaptor()));
+	connect(pageLayoutModule->backgroundPB, SIGNAL(clicked()),
+		this, SLOT(changeBackgroundColor()));
+	connect(pageLayoutModule->delbackgroundTB, SIGNAL(clicked()),
+		this, SLOT(deleteBackgroundColor()));
 
 	pageLayoutModule->pagestyleCO->addItem(qt_("Default"));
 	pageLayoutModule->pagestyleCO->addItem(qt_("empty"));
@@ -862,10 +903,28 @@ GuiDocument::GuiDocument(GuiView & lv)
 		this, SLOT(change_adaptor()));
 	connect(biblioModule->bibtopicCB, SIGNAL(clicked()),
 		this, SLOT(change_adaptor()));
+	connect(biblioModule->bibtexCO, SIGNAL(activated(int)),
+		this, SLOT(bibtexChanged(int)));
+	connect(biblioModule->bibtexOptionsED, SIGNAL(textChanged(QString)),
+		this, SLOT(change_adaptor()));
 	// biblio
 	biblioModule->citeStyleCO->addItem(qt_("Author-year"));
 	biblioModule->citeStyleCO->addItem(qt_("Numerical"));
 	biblioModule->citeStyleCO->setCurrentIndex(0);
+	
+	biblioModule->bibtexCO->clear();
+
+	biblioModule->bibtexCO->addItem(qt_("Default"), QString("default"));
+	for (set<string>::const_iterator it = lyxrc.bibtex_alternatives.begin();
+			     it != lyxrc.bibtex_alternatives.end(); ++it) {
+		QString const command = toqstr(*it).left(toqstr(*it).indexOf(" "));
+		biblioModule->bibtexCO->addItem(command, command);
+	}
+
+	// indices
+	indicesModule = new GuiIndices;
+	connect(indicesModule, SIGNAL(changed()),
+		this, SLOT(change_adaptor()));
 
 
 	mathsModule = new UiWidget<Ui::MathsUi>;
@@ -873,6 +932,8 @@ GuiDocument::GuiDocument(GuiView & lv)
 		mathsModule->amsCB, SLOT(setDisabled(bool)));
 	connect(mathsModule->esintautoCB, SIGNAL(toggled(bool)),
 		mathsModule->esintCB, SLOT(setDisabled(bool)));
+	connect(mathsModule->mhchemautoCB, SIGNAL(toggled(bool)),
+		mathsModule->mhchemCB, SLOT(setDisabled(bool)));
 	// maths
 	connect(mathsModule->amsCB, SIGNAL(clicked()),
 		this, SLOT(change_adaptor()));
@@ -882,6 +943,10 @@ GuiDocument::GuiDocument(GuiView & lv)
 		this, SLOT(change_adaptor()));
 	connect(mathsModule->esintautoCB, SIGNAL(clicked()),
 		this, SLOT(change_adaptor()));
+	connect(mathsModule->mhchemCB, SIGNAL(clicked()),
+		this, SLOT(change_adaptor()));
+	connect(mathsModule->mhchemautoCB, SIGNAL(clicked()),
+		this, SLOT(change_adaptor()));
 
 	latexModule = new UiWidget<Ui::LaTeXUi>;
 	// latex class
@@ -905,18 +970,9 @@ GuiDocument::GuiDocument(GuiView & lv)
 		this, SLOT(change_adaptor()));
 	connect(latexModule->childDocPB, SIGNAL(clicked()),
 		this, SLOT(browseMaster()));
-	
-	selectionManager =
-		new ModuleSelectionManager(latexModule->availableLV,
-			latexModule->selectedLV, 
-			latexModule->addPB, latexModule->deletePB, 
-	 		latexModule->upPB, latexModule->downPB, 
-			availableModel(), selectedModel());
-	connect(selectionManager, SIGNAL(updateHook()),
-		this, SLOT(updateModuleInfo()));
-	connect(selectionManager, SIGNAL(updateHook()),
+	connect(latexModule->suppressDateCB, SIGNAL(clicked()),
 		this, SLOT(change_adaptor()));
-	
+
 	// postscript drivers
 	for (int n = 0; tex_graphics[n][0]; ++n) {
 		QString enc = qt_(tex_graphics_gui[n]);
@@ -942,6 +998,9 @@ GuiDocument::GuiDocument(GuiView & lv)
 	branchesModule = new GuiBranches;
 	connect(branchesModule, SIGNAL(changed()),
 		this, SLOT(change_adaptor()));
+	connect(branchesModule, SIGNAL(renameBranches(docstring const &, docstring const &)),
+		this, SLOT(branchesRename(docstring const &, docstring const &)));
+	updateUnknownBranches();
 
 	// preamble
 	preambleModule = new PreambleModule;
@@ -953,6 +1012,22 @@ GuiDocument::GuiDocument(GuiView & lv)
 	connect(bulletsModule, SIGNAL(changed()),
 		this, SLOT(change_adaptor()));
 
+	// Modules
+	modulesModule = new UiWidget<Ui::ModulesUi>;
+	modulesModule->availableLV->header()->setVisible(false);
+	selectionManager =
+		new ModuleSelectionManager(modulesModule->availableLV,
+			modulesModule->selectedLV,
+			modulesModule->addPB, modulesModule->deletePB,
+			modulesModule->upPB, modulesModule->downPB,
+			availableModel(), selectedModel(), this);
+	connect(selectionManager, SIGNAL(updateHook()),
+		this, SLOT(updateModuleInfo()));
+	connect(selectionManager, SIGNAL(updateHook()),
+		this, SLOT(change_adaptor()));
+	connect(selectionManager, SIGNAL(selectionChanged()),
+		this, SLOT(modulesChanged()));
+
 	// PDF support
 	pdfSupportModule = new UiWidget<Ui::PDFSupportUi>;
 
@@ -997,7 +1072,22 @@ GuiDocument::GuiDocument(GuiView & lv)
 	connect(floatModule, SIGNAL(changed()),
 		this, SLOT(change_adaptor()));
 
+	// listings
+	listingsModule = new UiWidget<Ui::ListingsSettingsUi>;
+	connect(listingsModule->listingsED, SIGNAL(textChanged()),
+		this, SLOT(change_adaptor()));
+	connect(listingsModule->bypassCB, SIGNAL(clicked()), 
+		this, SLOT(change_adaptor()));
+	connect(listingsModule->bypassCB, SIGNAL(clicked()), 
+		this, SLOT(setListingsMessage()));
+	connect(listingsModule->listingsED, SIGNAL(textChanged()),
+		this, SLOT(setListingsMessage()));
+	listingsModule->listingsTB->setPlainText(
+		qt_("Input listings parameters below. Enter ? for a list of parameters."));
+
 	docPS->addPanel(latexModule, qt_("Document Class"));
+	docPS->addPanel(masterChildModule, qt_("Child Documents"));
+	docPS->addPanel(modulesModule, qt_("Modules"));
 	docPS->addPanel(fontModule, qt_("Fonts"));
 	docPS->addPanel(textLayoutModule, qt_("Text Layout"));
 	docPS->addPanel(pageLayoutModule, qt_("Page Layout"));
@@ -1005,11 +1095,14 @@ GuiDocument::GuiDocument(GuiView & lv)
 	docPS->addPanel(langModule, qt_("Language"));
 	docPS->addPanel(numberingModule, qt_("Numbering & TOC"));
 	docPS->addPanel(biblioModule, qt_("Bibliography"));
+	docPS->addPanel(indicesModule, qt_("Indexes"));
 	docPS->addPanel(pdfSupportModule, qt_("PDF Properties"));
 	docPS->addPanel(mathsModule, qt_("Math Options"));
 	docPS->addPanel(floatModule, qt_("Float Placement"));
+	docPS->addPanel(listingsModule, qt_("Listings"));
 	docPS->addPanel(bulletsModule, qt_("Bullets"));
 	docPS->addPanel(branchesModule, qt_("Branches"));
+	docPS->addPanel(outputModule, qt_("Output"));
 	docPS->addPanel(preambleModule, qt_("LaTeX Preamble"));
 	docPS->setCurrentPanel(qt_("Document Class"));
 // FIXME: hack to work around resizing bug in Qt >= 4.2
@@ -1044,6 +1137,26 @@ void GuiDocument::change_adaptor()
 }
 
 
+void GuiDocument::includeonlyClicked(QTreeWidgetItem * item, int)
+{
+	if (item == 0)
+		return;
+
+	string child = fromqstr(item->text(0));
+	if (child.empty())
+		return;
+
+	if (std::find(includeonlys_.begin(),
+		      includeonlys_.end(), child) != includeonlys_.end())
+		includeonlys_.remove(child);
+	else
+		includeonlys_.push_back(child);
+	
+	updateIncludeonlys();
+	changed();
+}
+
+
 QString GuiDocument::validateListingsParameters()
 {
 	// use a cache here to avoid repeated validation
@@ -1051,10 +1164,10 @@ QString GuiDocument::validateListingsParameters()
 	static string param_cache;
 	static QString msg_cache;
 	
-	if (textLayoutModule->bypassCB->isChecked())
+	if (listingsModule->bypassCB->isChecked())
 		return QString();
 
-	string params = fromqstr(textLayoutModule->listingsED->toPlainText());
+	string params = fromqstr(listingsModule->listingsED->toPlainText());
 	if (params != param_cache) {
 		param_cache = params;
 		msg_cache = toqstr(InsetListingsParams(params).validate());
@@ -1072,13 +1185,13 @@ void GuiDocument::setListingsMessage()
 			return;
 		isOK = true;
 		// listingsTB->setTextColor("black");
-		textLayoutModule->listingsTB->setPlainText(
-			qt_("Input listings parameters on the right. "
+		listingsModule->listingsTB->setPlainText(
+			qt_("Input listings parameters below. "
                 "Enter ? for a list of parameters."));
 	} else {
 		isOK = false;
 		// listingsTB->setTextColor("red");
-		textLayoutModule->listingsTB->setPlainText(msg);
+		listingsModule->listingsTB->setPlainText(msg);
 	}
 }
 
@@ -1089,39 +1202,73 @@ void GuiDocument::setLSpacing(int item)
 }
 
 
+void GuiDocument::setIndent(int item)
+{
+	bool const enable = (item == 1);
+	textLayoutModule->indentLE->setEnabled(enable);
+	textLayoutModule->indentLengthCO->setEnabled(enable);
+	textLayoutModule->skipLE->setEnabled(false);
+	textLayoutModule->skipLengthCO->setEnabled(false);
+	isValid();
+}
+
+
+void GuiDocument::enableIndent(bool indent)
+{
+	textLayoutModule->skipLE->setEnabled(!indent);
+	textLayoutModule->skipLengthCO->setEnabled(!indent);
+	if (indent)
+		setIndent(textLayoutModule->indentCO->currentIndex());
+}
+
+
 void GuiDocument::setSkip(int item)
 {
 	bool const enable = (item == 3);
 	textLayoutModule->skipLE->setEnabled(enable);
 	textLayoutModule->skipLengthCO->setEnabled(enable);
+	isValid();
 }
 
 
 void GuiDocument::enableSkip(bool skip)
 {
-	textLayoutModule->skipCO->setEnabled(skip);
-	textLayoutModule->skipLE->setEnabled(skip);
-	textLayoutModule->skipLengthCO->setEnabled(skip);
+	textLayoutModule->indentLE->setEnabled(!skip);
+	textLayoutModule->indentLengthCO->setEnabled(!skip);
 	if (skip)
 		setSkip(textLayoutModule->skipCO->currentIndex());
 }
 
+
 void GuiDocument::portraitChanged()
 {
 	setMargins(pageLayoutModule->papersizeCO->currentIndex());
 }
 
+
 void GuiDocument::setMargins(bool custom)
 {
+	bool const extern_geometry =
+		documentClass().provides("geometry");
+	marginsModule->marginCB->setEnabled(!extern_geometry);
+	if (extern_geometry) {
+		marginsModule->marginCB->setChecked(false);
+		setCustomMargins(true);
+		return;
+	}
 	marginsModule->marginCB->setChecked(custom);
 	setCustomMargins(custom);
 }
 
 
-void GuiDocument::setCustomPapersize(int papersize)
+void GuiDocument::papersizeChanged(int paper_size)
 {
-	bool const custom = (papersize == 1);
+	setCustomPapersize(paper_size == 1);
+}
+
 
+void GuiDocument::setCustomPapersize(bool custom)
+{
 	pageLayoutModule->paperwidthL->setEnabled(custom);
 	pageLayoutModule->paperwidthLE->setEnabled(custom);
 	pageLayoutModule->paperwidthUnitCO->setEnabled(custom);
@@ -1175,6 +1322,66 @@ void GuiDocument::setCustomMargins(bool custom)
 	marginsModule->columnsepUnit->setEnabled(enableColSep);
 }
 
+void GuiDocument::changeBackgroundColor()
+{
+	QColor const & newColor = QColorDialog::getColor(
+		rgb2qcolor(set_backgroundcolor), asQWidget());
+	if (!newColor.isValid())
+		return;
+	// set the button color
+	pageLayoutModule->backgroundPB->setStyleSheet(
+		colorButtonStyleSheet(newColor));
+	// save color
+	set_backgroundcolor = rgbFromHexName(fromqstr(newColor.name()));
+	changed();
+}
+
+
+void GuiDocument::deleteBackgroundColor()
+{
+	// set the button color back to white
+	pageLayoutModule->backgroundPB->setStyleSheet(
+		colorButtonStyleSheet(QColor(Qt::white)));
+	// save white as the set color
+	set_backgroundcolor = rgbFromHexName("#ffffff");
+	changed();
+}
+
+
+void GuiDocument::xetexChanged(bool xetex)
+{
+	updateFontlist();
+	updateDefaultFormat();
+	langModule->encodingCO->setEnabled(!xetex &&
+		!langModule->defaultencodingRB->isChecked());
+	langModule->defaultencodingRB->setEnabled(!xetex);
+	langModule->otherencodingRB->setEnabled(!xetex);
+
+	fontModule->fontsDefaultCO->setEnabled(!xetex);
+	fontModule->fontsDefaultLA->setEnabled(!xetex);
+	fontModule->cjkFontLE->setEnabled(!xetex);
+	fontModule->cjkFontLA->setEnabled(!xetex);
+	string font;
+	if (!xetex)
+		font = tex_fonts_sans[fontModule->fontsSansCO->currentIndex()];
+	bool scaleable = providesScale(font);
+	fontModule->scaleSansSB->setEnabled(scaleable);
+	fontModule->scaleSansLA->setEnabled(scaleable);
+	if (!xetex)
+		font = tex_fonts_monospaced[fontModule->fontsTypewriterCO->currentIndex()];
+	scaleable = providesScale(font);
+	fontModule->scaleTypewriterSB->setEnabled(scaleable);
+	fontModule->scaleTypewriterLA->setEnabled(scaleable);
+	if (!xetex)
+		font = tex_fonts_roman[fontModule->fontsRomanCO->currentIndex()];
+	fontModule->fontScCB->setEnabled(providesSC(font));
+	fontModule->fontOsfCB->setEnabled(providesOSF(font));
+	
+	fontModule->fontencLA->setEnabled(!xetex);
+	fontModule->fontencCO->setEnabled(!xetex);
+	fontModule->fontencLE->setEnabled(!xetex);
+}
+
 
 void GuiDocument::updateFontsize(string const & items, string const & sel)
 {
@@ -1194,8 +1401,59 @@ void GuiDocument::updateFontsize(string const & items, string const & sel)
 }
 
 
+void GuiDocument::updateFontlist()
+{
+	fontModule->fontsRomanCO->clear();
+	fontModule->fontsSansCO->clear();
+	fontModule->fontsTypewriterCO->clear();
+
+	// With XeTeX, we have access to all system fonts, but not the LaTeX fonts
+	if (outputModule->xetexCB->isChecked()) {
+		fontModule->fontsRomanCO->addItem(qt_("Default"));
+		fontModule->fontsSansCO->addItem(qt_("Default"));
+		fontModule->fontsTypewriterCO->addItem(qt_("Default"));
+	
+		QFontDatabase fontdb;
+		QStringList families(fontdb.families());
+		for (QStringList::Iterator it = families.begin(); it != families.end(); ++it) {
+			fontModule->fontsRomanCO->addItem(*it);
+			fontModule->fontsSansCO->addItem(*it);
+			fontModule->fontsTypewriterCO->addItem(*it);
+		}
+		return;
+	}
+
+	for (int n = 0; tex_fonts_roman[n][0]; ++n) {
+		QString font = qt_(tex_fonts_roman_gui[n]);
+		if (!isFontAvailable(tex_fonts_roman[n]))
+			font += qt_(" (not installed)");
+		fontModule->fontsRomanCO->addItem(font);
+	}
+	for (int n = 0; tex_fonts_sans[n][0]; ++n) {
+		QString font = qt_(tex_fonts_sans_gui[n]);
+		if (!isFontAvailable(tex_fonts_sans[n]))
+			font += qt_(" (not installed)");
+		fontModule->fontsSansCO->addItem(font);
+	}
+	for (int n = 0; tex_fonts_monospaced[n][0]; ++n) {
+		QString font = qt_(tex_fonts_monospaced_gui[n]);
+		if (!isFontAvailable(tex_fonts_monospaced[n]))
+			font += qt_(" (not installed)");
+		fontModule->fontsTypewriterCO->addItem(font);
+	}
+}
+
+
+void GuiDocument::fontencChanged(int item)
+{
+	fontModule->fontencLE->setEnabled(item == 1);
+}
+
+
 void GuiDocument::romanChanged(int item)
 {
+	if (outputModule->xetexCB->isChecked())
+		return;
 	string const font = tex_fonts_roman[item];
 	fontModule->fontScCB->setEnabled(providesSC(font));
 	fontModule->fontOsfCB->setEnabled(providesOSF(font));
@@ -1204,6 +1462,8 @@ void GuiDocument::romanChanged(int item)
 
 void GuiDocument::sansChanged(int item)
 {
+	if (outputModule->xetexCB->isChecked())
+		return;
 	string const font = tex_fonts_sans[item];
 	bool scaleable = providesScale(font);
 	fontModule->scaleSansSB->setEnabled(scaleable);
@@ -1213,6 +1473,8 @@ void GuiDocument::sansChanged(int item)
 
 void GuiDocument::ttChanged(int item)
 {
+	if (outputModule->xetexCB->isChecked())
+		return;
 	string const font = tex_fonts_monospaced[item];
 	bool scaleable = providesScale(font);
 	fontModule->scaleTypewriterSB->setEnabled(scaleable);
@@ -1313,7 +1575,8 @@ void GuiDocument::browseMaster()
 	QString file = browseRelFile(old, docpath, title, filter, false,
 		qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
 
-	latexModule->childDocLE->setText(file);
+	if (!file.isEmpty())
+		latexModule->childDocLE->setText(file);
 }
 
 
@@ -1325,21 +1588,21 @@ void GuiDocument::classChanged()
 	string const classname = classes_model_.getIDString(idx);
 
 	// check whether the selected modules have changed.
-	bool modulesChanged = false;
+	bool modules_changed = false;
 	unsigned int const srows = selectedModel()->rowCount();
 	if (srows != bp_.getModules().size())
-		modulesChanged = true;
+		modules_changed = true;
 	else {
 		list<string>::const_iterator mit = bp_.getModules().begin();
 		list<string>::const_iterator men = bp_.getModules().end();
 		for (unsigned int i = 0; i < srows && mit != men; ++i, ++mit)
 			if (selectedModel()->getIDString(i) != *mit) {
-				modulesChanged = true;
+				modules_changed = true;
 				break;
 			}
 	}
 
-	if (modulesChanged || lyxrc.auto_reset_options) {
+	if (modules_changed || lyxrc.auto_reset_options) {
 		if (applyPB->isEnabled()) {
 			int const ret = Alert::prompt(_("Unapplied changes"),
 					_("Some changes in the dialog were not yet applied.\n"
@@ -1369,12 +1632,17 @@ void GuiDocument::classChanged()
 	// class. So when we set the base class, we also need to recreate the document 
 	// class. Otherwise, we still have the old one.
 	bp_.makeDocumentClass();
-	// the new class may require some default modules.
-	updateSelectedModules();
 	paramsToDialog();
 }
 
 
+void GuiDocument::bibtexChanged(int n)
+{
+	biblioModule->bibtexOptionsED->setEnabled(n != 0);
+	changed();
+}
+
+
 namespace {
 	// This is an insanely complicated attempt to make this sort of thing
 	// work with RTL languages.
@@ -1384,22 +1652,22 @@ namespace {
 		if (v.size() == 0)
 			return docstring();
 		if (v.size() == 1) 
-			return from_ascii(v[0]);
+			return from_utf8(v[0]);
 		if (v.size() == 2) {
 			docstring retval = _("%1$s and %2$s");
 			retval = subst(retval, _("and"), s);
-			return bformat(retval, from_ascii(v[0]), from_ascii(v[1]));
+			return bformat(retval, from_utf8(v[0]), from_utf8(v[1]));
 		}
 		// The idea here is to format all but the last two items...
 		int const vSize = v.size();
 		docstring t2 = _("%1$s, %2$s");
-		docstring retval = from_ascii(v[0]);
+		docstring retval = from_utf8(v[0]);
 		for (int i = 1; i < vSize - 2; ++i)
-			retval = bformat(t2, retval, from_ascii(v[i])); 
+			retval = bformat(t2, retval, from_utf8(v[i])); 
 		//...and then to  plug them, and the last two, into this schema
 		docstring t = _("%1$s, %2$s, and %3$s");
 		t = subst(t, _("and"), s);
-		return bformat(t, retval, from_ascii(v[vSize - 2]), from_ascii(v[vSize - 1]));
+		return bformat(t, retval, from_utf8(v[vSize - 2]), from_utf8(v[vSize - 1]));
 	}
 	
 	vector<string> idsToNames(vector<string> const & idList)
@@ -1408,7 +1676,7 @@ namespace {
 		vector<string>::const_iterator it  = idList.begin();
 		vector<string>::const_iterator end = idList.end();
 		for (; it != end; ++it) {
-			LyXModule const * const mod = moduleList[*it];
+			LyXModule const * const mod = theModuleList[*it];
 			if (!mod)
 				retval.push_back(*it + " (Unavailable)");
 			else
@@ -1419,45 +1687,95 @@ namespace {
 }
 
 
+void GuiDocument::modulesToParams(BufferParams & bp)
+{
+	// update list of loaded modules
+	bp.clearLayoutModules();
+	int const srows = modules_sel_model_.rowCount();
+	for (int i = 0; i < srows; ++i)
+		bp.addLayoutModule(modules_sel_model_.getIDString(i));
+
+	// update the list of removed modules
+	bp.clearRemovedModules();
+	LayoutModuleList const & reqmods = bp.baseClass()->defaultModules();
+	list<string>::const_iterator rit = reqmods.begin();
+	list<string>::const_iterator ren = reqmods.end();
+
+	// check each of the default modules
+	for (; rit != ren; rit++) {
+		list<string>::const_iterator mit = bp.getModules().begin();
+		list<string>::const_iterator men = bp.getModules().end();
+		bool found = false;
+		for (; mit != men; mit++) {
+			if (*rit == *mit) {
+				found = true;
+				break;
+			}
+		}
+		if (!found) {
+			// the module isn't present so must have been removed by the user
+			bp.addRemovedModule(*rit);
+		}
+	}
+}
+
+void GuiDocument::modulesChanged()
+{
+	modulesToParams(bp_);
+	bp_.makeDocumentClass();
+	paramsToDialog();
+}
+
+
 void GuiDocument::updateModuleInfo()
 {
 	selectionManager->update();
 	
 	//Module description
-	bool const focusOnSelected = selectionManager->selectedFocused();
-	QListView const * const lv = 
-			focusOnSelected ? latexModule->selectedLV : latexModule->availableLV;
+	bool const focus_on_selected = selectionManager->selectedFocused();
+	QAbstractItemView * lv;
+	if (focus_on_selected)
+		lv = modulesModule->selectedLV;
+	else
+		lv= modulesModule->availableLV;
 	if (lv->selectionModel()->selectedIndexes().isEmpty()) {
-		latexModule->infoML->document()->clear();
+		modulesModule->infoML->document()->clear();
 		return;
 	}
 	QModelIndex const & idx = lv->selectionModel()->currentIndex();
-	GuiIdListModel const & idModel = 
-			focusOnSelected  ? modules_sel_model_ : modules_av_model_;
-	string const modName = idModel.getIDString(idx.row());
+	GuiIdListModel const & id_model = 
+			focus_on_selected  ? modules_sel_model_ : modules_av_model_;
+	string const modName = id_model.getIDString(idx.row());
 	docstring desc = getModuleDescription(modName);
 
-	vector<string> pkgList = getPackageList(modName);
-	docstring pkgdesc = formatStrVec(pkgList, _("and"));
+	LayoutModuleList const & provmods = bp_.baseClass()->providedModules();
+	if (std::find(provmods.begin(), provmods.end(), modName) != provmods.end()) {
+		if (!desc.empty())
+			desc += "\n";
+		desc += _("Module provided by document class.");
+	}
+
+	vector<string> pkglist = getPackageList(modName);
+	docstring pkgdesc = formatStrVec(pkglist, _("and"));
 	if (!pkgdesc.empty()) {
 		if (!desc.empty())
 			desc += "\n";
 		desc += bformat(_("Package(s) required: %1$s."), pkgdesc);
 	}
 
-	pkgList = getRequiredList(modName);
-	if (!pkgList.empty()) {
-		vector<string> const reqDescs = idsToNames(pkgList);
-		pkgdesc = formatStrVec(reqDescs, _("or"));
+	pkglist = getRequiredList(modName);
+	if (!pkglist.empty()) {
+		vector<string> const reqdescs = idsToNames(pkglist);
+		pkgdesc = formatStrVec(reqdescs, _("or"));
 		if (!desc.empty())
 			desc += "\n";
 		desc += bformat(_("Module required: %1$s."), pkgdesc);
 	}
 
-	pkgList = getExcludedList(modName);
-	if (!pkgList.empty()) {
-		vector<string> const reqDescs = idsToNames(pkgList);
-		pkgdesc = formatStrVec(reqDescs, _( "and"));
+	pkglist = getExcludedList(modName);
+	if (!pkglist.empty()) {
+		vector<string> const reqdescs = idsToNames(pkglist);
+		pkgdesc = formatStrVec(reqdescs, _( "and"));
 		if (!desc.empty())
 			desc += "\n";
 		desc += bformat(_("Modules excluded: %1$s."), pkgdesc);
@@ -1466,10 +1784,10 @@ void GuiDocument::updateModuleInfo()
 	if (!isModuleAvailable(modName)) {
 		if (!desc.empty())
 			desc += "\n";
-		desc += _("WARNING: Some packages are unavailable!");
+		desc += _("WARNING: Some required packages are unavailable!");
 	}
 
-	latexModule->infoML->document()->setPlainText(toqstr(desc));
+	modulesModule->infoML->document()->setPlainText(toqstr(desc));
 }
 
 
@@ -1503,35 +1821,86 @@ void GuiDocument::updateNumbering()
 }
 
 
-void GuiDocument::apply(BufferParams & params)
+void GuiDocument::updateDefaultFormat()
+{
+	// make a copy in order to consider unapplied changes
+	Buffer * tmpbuf = const_cast<Buffer *>(&buffer());
+	tmpbuf->params().useXetex = outputModule->xetexCB->isChecked();
+	int idx = latexModule->classCO->currentIndex();
+	if (idx >= 0) {
+		string const classname = classes_model_.getIDString(idx);
+		tmpbuf->params().setBaseClass(classname);
+		tmpbuf->params().makeDocumentClass();
+	}
+	outputModule->defaultFormatCO->blockSignals(true);
+	outputModule->defaultFormatCO->clear();
+	outputModule->defaultFormatCO->addItem(qt_("Default"),
+				QVariant(QString("default")));
+	typedef vector<Format const *> Formats;
+	Formats formats = tmpbuf->exportableFormats(true);
+	Formats::const_iterator cit = formats.begin();
+	Formats::const_iterator end = formats.end();
+	for (; cit != end; ++cit)
+		outputModule->defaultFormatCO->addItem(qt_((*cit)->prettyname()),
+				QVariant(toqstr((*cit)->name())));
+	outputModule->defaultFormatCO->blockSignals(false);
+}
+
+
+bool GuiDocument::isChildIncluded(string const & child)
+{
+	if (includeonlys_.empty())
+		return false;
+	return (std::find(includeonlys_.begin(),
+			  includeonlys_.end(), child) != includeonlys_.end());
+}
+
+
+void GuiDocument::applyView()
 {
 	// preamble
-	preambleModule->apply(params);
+	preambleModule->apply(bp_);
+
+	// date
+	bp_.suppress_date = latexModule->suppressDateCB->isChecked();
 
 	// biblio
-	params.setCiteEngine(ENGINE_BASIC);
+	bp_.setCiteEngine(ENGINE_BASIC);
 
 	if (biblioModule->citeNatbibRB->isChecked()) {
 		bool const use_numerical_citations =
 			biblioModule->citeStyleCO->currentIndex();
 		if (use_numerical_citations)
-			params.setCiteEngine(ENGINE_NATBIB_NUMERICAL);
+			bp_.setCiteEngine(ENGINE_NATBIB_NUMERICAL);
 		else
-			params.setCiteEngine(ENGINE_NATBIB_AUTHORYEAR);
+			bp_.setCiteEngine(ENGINE_NATBIB_AUTHORYEAR);
 
 	} else if (biblioModule->citeJurabibRB->isChecked())
-		params.setCiteEngine(ENGINE_JURABIB);
+		bp_.setCiteEngine(ENGINE_JURABIB);
 
-	params.use_bibtopic =
+	bp_.use_bibtopic =
 		biblioModule->bibtopicCB->isChecked();
 
+	string const bibtex_command =
+		fromqstr(biblioModule->bibtexCO->itemData(
+			biblioModule->bibtexCO->currentIndex()).toString());
+	string const bibtex_options =
+		fromqstr(biblioModule->bibtexOptionsED->text());
+	if (bibtex_command == "default" || bibtex_options.empty())
+		bp_.bibtex_command = bibtex_command;
+	else
+		bp_.bibtex_command = bibtex_command + " " + bibtex_options;
+
+	// Indices
+	indicesModule->apply(bp_);
+
 	// language & quotes
 	if (langModule->defaultencodingRB->isChecked()) {
-		params.inputenc = "auto";
+		bp_.inputenc = "auto";
 	} else {
 		int i = langModule->encodingCO->currentIndex();
 		if (i == 0)
-			params.inputenc = "default";
+			bp_.inputenc = "default";
 		else {
 			QString const enc_gui =
 				langModule->encodingCO->currentText();
@@ -1540,7 +1909,7 @@ void GuiDocument::apply(BufferParams & params)
 			bool found = false;
 			for (; it != end; ++it) {
 				if (qt_(it->guiName()) == enc_gui) {
-					params.inputenc = it->latexName();
+					bp_.inputenc = it->latexName();
 					found = true;
 					break;
 				}
@@ -1548,7 +1917,7 @@ void GuiDocument::apply(BufferParams & params)
 			if (!found) {
 				// should not happen
 				lyxerr << "GuiDocument::apply: Unknown encoding! Resetting to default" << endl;
-				params.inputenc = "default";
+				bp_.inputenc = "default";
 			}
 		}
 	}
@@ -1574,233 +1943,289 @@ void GuiDocument::apply(BufferParams & params)
 		lga = InsetQuotes::DanishQuotes;
 		break;
 	}
-	params.quotes_language = lga;
+	bp_.quotes_language = lga;
 
 	QString const lang = langModule->languageCO->itemData(
 		langModule->languageCO->currentIndex()).toString();
-	params.language = lyx::languages.getLanguage(fromqstr(lang));
+	bp_.language = lyx::languages.getLanguage(fromqstr(lang));
 
 	// numbering
-	if (params.documentClass().hasTocLevels()) {
-		params.tocdepth = numberingModule->tocSL->value();
-		params.secnumdepth = numberingModule->depthSL->value();
+	if (bp_.documentClass().hasTocLevels()) {
+		bp_.tocdepth = numberingModule->tocSL->value();
+		bp_.secnumdepth = numberingModule->depthSL->value();
 	}
 
 	// bullets
-	params.user_defined_bullet(0) = bulletsModule->bullet(0);
-	params.user_defined_bullet(1) = bulletsModule->bullet(1);
-	params.user_defined_bullet(2) = bulletsModule->bullet(2);
-	params.user_defined_bullet(3) = bulletsModule->bullet(3);
+	bp_.user_defined_bullet(0) = bulletsModule->bullet(0);
+	bp_.user_defined_bullet(1) = bulletsModule->bullet(1);
+	bp_.user_defined_bullet(2) = bulletsModule->bullet(2);
+	bp_.user_defined_bullet(3) = bulletsModule->bullet(3);
 
 	// packages
-	params.graphicsDriver =
+	bp_.graphicsDriver =
 		tex_graphics[latexModule->psdriverCO->currentIndex()];
 	
 	// text layout
 	int idx = latexModule->classCO->currentIndex();
 	if (idx >= 0) {
 		string const classname = classes_model_.getIDString(idx);
-		params.setBaseClass(classname);
+		bp_.setBaseClass(classname);
 	}
 
 	// Modules
-	params.clearLayoutModules();
-	int const srows = modules_sel_model_.rowCount();
-	vector<string> selModList;
-	for (int i = 0; i < srows; ++i)
-		params.addLayoutModule(modules_sel_model_.getIDString(i));
-	// update the list of removed modules
-	params.clearRemovedModules();
-	list<string> const & reqmods = params.baseClass()->defaultModules();
-	list<string>::const_iterator rit = reqmods.begin();
-	list<string>::const_iterator ren = reqmods.end();
-	// check each of the required modules
-	for (; rit != ren; rit++) {
-		list<string>::const_iterator mit = params.getModules().begin();
-		list<string>::const_iterator men = params.getModules().end();
-		bool found = false;
-		for (; mit != men; mit++) {
-			if (*rit == *mit) {
-				found = true;
-				break;
-			}
-		}
-		if (!found) {
-			// the module isn't present so must have been removed by the user
-			params.addRemovedModule(*rit);
-		}
-	}
+	modulesToParams(bp_);
 
+	// Math
 	if (mathsModule->amsautoCB->isChecked()) {
-		params.use_amsmath = BufferParams::package_auto;
+		bp_.use_amsmath = BufferParams::package_auto;
 	} else {
 		if (mathsModule->amsCB->isChecked())
-			params.use_amsmath = BufferParams::package_on;
+			bp_.use_amsmath = BufferParams::package_on;
 		else
-			params.use_amsmath = BufferParams::package_off;
+			bp_.use_amsmath = BufferParams::package_off;
 	}
-
 	if (mathsModule->esintautoCB->isChecked())
-		params.use_esint = BufferParams::package_auto;
+		bp_.use_esint = BufferParams::package_auto;
 	else {
 		if (mathsModule->esintCB->isChecked())
-			params.use_esint = BufferParams::package_on;
+			bp_.use_esint = BufferParams::package_on;
+		else
+			bp_.use_esint = BufferParams::package_off;
+	}
+	if (mathsModule->mhchemautoCB->isChecked())
+		bp_.use_mhchem = BufferParams::package_auto;
+	else {
+		if (mathsModule->mhchemCB->isChecked())
+			bp_.use_mhchem = BufferParams::package_on;
 		else
-			params.use_esint = BufferParams::package_off;
+			bp_.use_mhchem = BufferParams::package_off;
 	}
 
+	// Page Layout
 	if (pageLayoutModule->pagestyleCO->currentIndex() == 0)
-		params.pagestyle = "default";
+		bp_.pagestyle = "default";
 	else {
 		QString style_gui = pageLayoutModule->pagestyleCO->currentText();
 		for (size_t i = 0; i != pagestyles.size(); ++i)
 			if (pagestyles[i].second == style_gui)
-				params.pagestyle = pagestyles[i].first;
+				bp_.pagestyle = pagestyles[i].first;
 	}
 
+	// Text Layout
 	switch (textLayoutModule->lspacingCO->currentIndex()) {
 	case 0:
-		params.spacing().set(Spacing::Single);
+		bp_.spacing().set(Spacing::Single);
 		break;
 	case 1:
-		params.spacing().set(Spacing::Onehalf);
+		bp_.spacing().set(Spacing::Onehalf);
 		break;
 	case 2:
-		params.spacing().set(Spacing::Double);
+		bp_.spacing().set(Spacing::Double);
 		break;
 	case 3:
-		params.spacing().set(Spacing::Other,
-			fromqstr(textLayoutModule->lspacingLE->text()));
+		bp_.spacing().set(Spacing::Other,
+			widgetToDoubleStr(textLayoutModule->lspacingLE));
 		break;
 	}
 
 	if (textLayoutModule->twoColumnCB->isChecked())
-		params.columns = 2;
-	else
-		params.columns = 1;
-
-	// text should have passed validation
-	params.listings_params =
-		InsetListingsParams(fromqstr(textLayoutModule->listingsED->toPlainText())).params();
-
-	if (textLayoutModule->indentRB->isChecked())
-		params.paragraph_separation = BufferParams::ParagraphIndentSeparation;
+		bp_.columns = 2;
 	else
-		params.paragraph_separation = BufferParams::ParagraphSkipSeparation;
-
-	switch (textLayoutModule->skipCO->currentIndex()) {
-	case 0:
-		params.setDefSkip(VSpace(VSpace::SMALLSKIP));
-		break;
-	case 1:
-		params.setDefSkip(VSpace(VSpace::MEDSKIP));
-		break;
-	case 2:
-		params.setDefSkip(VSpace(VSpace::BIGSKIP));
-		break;
-	case 3:
-	{
-		VSpace vs = VSpace(
-			widgetsToLength(textLayoutModule->skipLE,
+		bp_.columns = 1;
+
+	if (textLayoutModule->indentRB->isChecked()) {
+		// if paragraphs are separated by an indentation
+		bp_.paragraph_separation = BufferParams::ParagraphIndentSeparation;
+		switch (textLayoutModule->indentCO->currentIndex()) {
+		case 0:
+			bp_.setIndentation(HSpace(HSpace::DEFAULT));
+			break;
+		case 1:	{
+			HSpace indent = HSpace(
+				widgetsToLength(textLayoutModule->indentLE,
+				textLayoutModule->indentLengthCO)
+				);
+			bp_.setIndentation(indent);
+			break;
+			}
+		default:
+			// this should never happen
+			bp_.setIndentation(HSpace(HSpace::DEFAULT));
+			break;
+		}
+	} else {
+		// if paragraphs are separated by a skip
+		bp_.paragraph_separation = BufferParams::ParagraphSkipSeparation;
+		switch (textLayoutModule->skipCO->currentIndex()) {
+		case 0:
+			bp_.setDefSkip(VSpace(VSpace::SMALLSKIP));
+			break;
+		case 1:
+			bp_.setDefSkip(VSpace(VSpace::MEDSKIP));
+			break;
+		case 2:
+			bp_.setDefSkip(VSpace(VSpace::BIGSKIP));
+			break;
+		case 3:
+			{
+			VSpace vs = VSpace(
+				widgetsToLength(textLayoutModule->skipLE,
 				textLayoutModule->skipLengthCO)
-			);
-		params.setDefSkip(vs);
-		break;
-	}
-	default:
-		// DocumentDefskipCB assures that this never happens
-		// so Assert then !!!  - jbl
-		params.setDefSkip(VSpace(VSpace::MEDSKIP));
-		break;
+				);
+			bp_.setDefSkip(vs);
+			break;
+			}
+		default:
+			// this should never happen
+			bp_.setDefSkip(VSpace(VSpace::MEDSKIP));
+			break;
+		}
 	}
 
-	params.options =
+	bp_.options =
 		fromqstr(latexModule->optionsLE->text());
 
-	params.use_default_options =
+	bp_.use_default_options =
 		latexModule->defaultOptionsCB->isChecked();
 
 	if (latexModule->childDocGB->isChecked())
-		params.master =
+		bp_.master =
 			fromqstr(latexModule->childDocLE->text());
 	else
-		params.master = string();
+		bp_.master = string();
+
+	// Master/Child
+	bp_.clearIncludedChildren();
+	if (masterChildModule->includeonlyRB->isChecked()) {
+		list<string>::const_iterator it = includeonlys_.begin();
+		for (; it != includeonlys_.end() ; ++it) {
+			bp_.addIncludedChildren(*it);
+		}
+	}
+	bp_.maintain_unincluded_children =
+		masterChildModule->maintainAuxCB->isChecked();
 
-	params.float_placement = floatModule->get();
+	// Float Placement
+	bp_.float_placement = floatModule->get();
 
-	// fonts
-	params.fontsRoman =
-		tex_fonts_roman[fontModule->fontsRomanCO->currentIndex()];
+	// Listings
+	// text should have passed validation
+	bp_.listings_params =
+		InsetListingsParams(fromqstr(listingsModule->listingsED->toPlainText())).params();
+
+	// output
+	bp_.defaultOutputFormat = fromqstr(outputModule->defaultFormatCO->itemData(
+		outputModule->defaultFormatCO->currentIndex()).toString());
+
+	bool const xetex = outputModule->xetexCB->isChecked();
+	bp_.useXetex = xetex;
 
-	params.fontsSans =
-		tex_fonts_sans[fontModule->fontsSansCO->currentIndex()];
+	// fonts
+	if (xetex) {
+		if (fontModule->fontsRomanCO->currentIndex() == 0)
+			bp_.fontsRoman = "default";
+		else
+			bp_.fontsRoman =
+				fromqstr(fontModule->fontsRomanCO->currentText());
+	
+		if (fontModule->fontsSansCO->currentIndex() == 0)
+			bp_.fontsSans = "default";
+		else
+			bp_.fontsSans =
+				fromqstr(fontModule->fontsSansCO->currentText());
+	
+		if (fontModule->fontsTypewriterCO->currentIndex() == 0)
+			bp_.fontsTypewriter = "default";
+		else
+			bp_.fontsTypewriter =
+				fromqstr(fontModule->fontsTypewriterCO->currentText());
+	} else {
+		bp_.fontsRoman =
+			tex_fonts_roman[fontModule->fontsRomanCO->currentIndex()];
+	
+		bp_.fontsSans =
+			tex_fonts_sans[fontModule->fontsSansCO->currentIndex()];
+	
+		bp_.fontsTypewriter =
+			tex_fonts_monospaced[fontModule->fontsTypewriterCO->currentIndex()];
+	}
 
-	params.fontsTypewriter =
-		tex_fonts_monospaced[fontModule->fontsTypewriterCO->currentIndex()];
+	if (fontModule->fontencCO->currentIndex() == 0)
+		bp_.fontenc = "global";
+	else if (fontModule->fontencCO->currentIndex() == 1)
+		bp_.fontenc = fromqstr(fontModule->fontencLE->text());
+	else if (fontModule->fontencCO->currentIndex() == 2)
+		bp_.fontenc = "default";
 
-	params.fontsCJK =
+	bp_.fontsCJK =
 		fromqstr(fontModule->cjkFontLE->text());
 
-	params.fontsSansScale = fontModule->scaleSansSB->value();
+	bp_.fontsSansScale = fontModule->scaleSansSB->value();
 
-	params.fontsTypewriterScale = fontModule->scaleTypewriterSB->value();
+	bp_.fontsTypewriterScale = fontModule->scaleTypewriterSB->value();
 
-	params.fontsSC = fontModule->fontScCB->isChecked();
+	bp_.fontsSC = fontModule->fontScCB->isChecked();
 
-	params.fontsOSF = fontModule->fontOsfCB->isChecked();
+	bp_.fontsOSF = fontModule->fontOsfCB->isChecked();
 
-	params.fontsDefaultFamily = GuiDocument::fontfamilies[
-		fontModule->fontsDefaultCO->currentIndex()];
+	if (xetex)
+		bp_.fontsDefaultFamily = "default";
+	else
+		bp_.fontsDefaultFamily = GuiDocument::fontfamilies[
+			fontModule->fontsDefaultCO->currentIndex()];
 
 	if (fontModule->fontsizeCO->currentIndex() == 0)
-		params.fontsize = "default";
+		bp_.fontsize = "default";
 	else
-		params.fontsize =
+		bp_.fontsize =
 			fromqstr(fontModule->fontsizeCO->currentText());
 
 	// paper
-	params.papersize = PAPER_SIZE(
+	bp_.papersize = PAPER_SIZE(
 		pageLayoutModule->papersizeCO->currentIndex());
 
 	// custom, A3, B3 and B4 paper sizes need geometry
 	int psize = pageLayoutModule->papersizeCO->currentIndex();
 	bool geom_papersize = (psize == 1 || psize == 5 || psize == 8 || psize == 9);
 
-	params.paperwidth = widgetsToLength(pageLayoutModule->paperwidthLE,
+	bp_.paperwidth = widgetsToLength(pageLayoutModule->paperwidthLE,
 		pageLayoutModule->paperwidthUnitCO);
 
-	params.paperheight = widgetsToLength(pageLayoutModule->paperheightLE,
+	bp_.paperheight = widgetsToLength(pageLayoutModule->paperheightLE,
 		pageLayoutModule->paperheightUnitCO);
 
 	if (pageLayoutModule->facingPagesCB->isChecked())
-		params.sides = TwoSides;
+		bp_.sides = TwoSides;
 	else
-		params.sides = OneSide;
+		bp_.sides = OneSide;
 
 	if (pageLayoutModule->landscapeRB->isChecked())
-		params.orientation = ORIENTATION_LANDSCAPE;
+		bp_.orientation = ORIENTATION_LANDSCAPE;
 	else
-		params.orientation = ORIENTATION_PORTRAIT;
+		bp_.orientation = ORIENTATION_PORTRAIT;
+
+	bp_.backgroundcolor = set_backgroundcolor;
 
 	// margins
-	params.use_geometry = !marginsModule->marginCB->isChecked()
+	bp_.use_geometry = !marginsModule->marginCB->isChecked()
 		|| geom_papersize;
 
 	Ui::MarginsUi const * m = marginsModule;
 
-	params.leftmargin = widgetsToLength(m->innerLE, m->innerUnit);
-	params.topmargin = widgetsToLength(m->topLE, m->topUnit);
-	params.rightmargin = widgetsToLength(m->outerLE, m->outerUnit);
-	params.bottommargin = widgetsToLength(m->bottomLE, m->bottomUnit);
-	params.headheight = widgetsToLength(m->headheightLE, m->headheightUnit);
-	params.headsep = widgetsToLength(m->headsepLE, m->headsepUnit);
-	params.footskip = widgetsToLength(m->footskipLE, m->footskipUnit);
-	params.columnsep = widgetsToLength(m->columnsepLE, m->columnsepUnit);
+	bp_.leftmargin = widgetsToLength(m->innerLE, m->innerUnit);
+	bp_.topmargin = widgetsToLength(m->topLE, m->topUnit);
+	bp_.rightmargin = widgetsToLength(m->outerLE, m->outerUnit);
+	bp_.bottommargin = widgetsToLength(m->bottomLE, m->bottomUnit);
+	bp_.headheight = widgetsToLength(m->headheightLE, m->headheightUnit);
+	bp_.headsep = widgetsToLength(m->headsepLE, m->headsepUnit);
+	bp_.footskip = widgetsToLength(m->footskipLE, m->footskipUnit);
+	bp_.columnsep = widgetsToLength(m->columnsepLE, m->columnsepUnit);
 
-	branchesModule->apply(params);
+	// branches
+	branchesModule->apply(bp_);
 
 	// PDF support
-	PDFOptions & pdf = params.pdfoptions();
+	PDFOptions & pdf = bp_.pdfoptions();
 	pdf.use_hyperref = pdfSupportModule->use_hyperrefGB->isChecked();
 	pdf.title = fromqstr(pdfSupportModule->titleLE->text());
 	pdf.author = fromqstr(pdfSupportModule->authorLE->text());
@@ -1830,31 +2255,14 @@ void GuiDocument::apply(BufferParams & params)
 void GuiDocument::paramsToDialog()
 {
 	// set the default unit
-	Length::UNIT defaultUnit = Length::CM;
-	switch (lyxrc.default_papersize) {
-		case PAPER_DEFAULT: break;
-
-		case PAPER_USLETTER:
-		case PAPER_USLEGAL:
-		case PAPER_USEXECUTIVE:
-			defaultUnit = Length::IN;
-			break;
-
-		case PAPER_A3:
-		case PAPER_A4:
-		case PAPER_A5:
-		case PAPER_B3:
-		case PAPER_B4:
-		case PAPER_B5:
-			defaultUnit = Length::CM;
-			break;
-		case PAPER_CUSTOM:
-			break;
-	}
+	Length::UNIT const defaultUnit = Length::defaultUnit();
 
 	// preamble
 	preambleModule->update(bp_, id());
 
+	// date
+	latexModule->suppressDateCB->setChecked(bp_.suppress_date);
+
 	// biblio
 	biblioModule->citeDefaultRB->setChecked(
 		bp_.citeEngine() == ENGINE_BASIC);
@@ -1872,6 +2280,24 @@ void GuiDocument::paramsToDialog()
 	biblioModule->bibtopicCB->setChecked(
 		bp_.use_bibtopic);
 
+	string command;
+	string options =
+		split(bp_.bibtex_command, command, ' ');
+
+	int const bpos = biblioModule->bibtexCO->findData(toqstr(command));
+	if (bpos != -1) {
+		biblioModule->bibtexCO->setCurrentIndex(bpos);
+		biblioModule->bibtexOptionsED->setText(toqstr(options).trimmed());
+	} else {
+		biblioModule->bibtexCO->setCurrentIndex(0);
+		biblioModule->bibtexOptionsED->clear();
+	}
+	biblioModule->bibtexOptionsED->setEnabled(
+		biblioModule->bibtexCO->currentIndex() != 0);
+
+	// indices
+	indicesModule->update(bp_);
+
 	// language & quotes
 	int const pos = langModule->languageCO->findData(toqstr(
 		bp_.language->lang()));
@@ -1947,6 +2373,11 @@ void GuiDocument::paramsToDialog()
 	mathsModule->esintautoCB->setChecked(
 		bp_.use_esint == BufferParams::package_auto);
 
+	mathsModule->mhchemCB->setChecked(
+		bp_.use_mhchem == BufferParams::package_on);
+	mathsModule->mhchemautoCB->setChecked(
+		bp_.use_mhchem == BufferParams::package_auto);
+
 	switch (bp_.spacing().getSpace()) {
 		case Spacing::Other: nitem = 3; break;
 		case Spacing::Double: nitem = 2; break;
@@ -1963,51 +2394,56 @@ void GuiDocument::paramsToDialog()
 
 	textLayoutModule->lspacingCO->setCurrentIndex(nitem);
 	if (bp_.spacing().getSpace() == Spacing::Other) {
-		textLayoutModule->lspacingLE->setText(
-			toqstr(bp_.spacing().getValueAsString()));
+		doubleToWidget(textLayoutModule->lspacingLE,
+			bp_.spacing().getValueAsString());
 	}
 	setLSpacing(nitem);
 
-	if (bp_.paragraph_separation == BufferParams::ParagraphIndentSeparation)
+	if (bp_.paragraph_separation == BufferParams::ParagraphIndentSeparation) {
 		textLayoutModule->indentRB->setChecked(true);
-	else
+		string indentation = bp_.getIndentation().asLyXCommand();
+		int indent = 0;
+		if (indentation != "default") {
+			lengthToWidgets(textLayoutModule->indentLE,
+			textLayoutModule->indentLengthCO,
+			indentation, defaultUnit);
+			indent = 1;
+		}
+		textLayoutModule->indentCO->setCurrentIndex(indent);
+		setIndent(indent);
+	} else {
 		textLayoutModule->skipRB->setChecked(true);
-
-	int skip = 0;
-	switch (bp_.getDefSkip().kind()) {
-	case VSpace::SMALLSKIP:
-		skip = 0;
-		break;
-	case VSpace::MEDSKIP:
-		skip = 1;
-		break;
-	case VSpace::BIGSKIP:
-		skip = 2;
-		break;
-	case VSpace::LENGTH:
-	{
-		skip = 3;
-		string const length = bp_.getDefSkip().asLyXCommand();
-		lengthToWidgets(textLayoutModule->skipLE,
-			textLayoutModule->skipLengthCO,
-			length, defaultUnit);
-		break;
-	}
-	default:
-		skip = 0;
-		break;
+		int skip = 0;
+		switch (bp_.getDefSkip().kind()) {
+		case VSpace::SMALLSKIP:
+			skip = 0;
+			break;
+		case VSpace::MEDSKIP:
+			skip = 1;
+			break;
+		case VSpace::BIGSKIP:
+			skip = 2;
+			break;
+		case VSpace::LENGTH:
+			{
+			skip = 3;
+			string const length = bp_.getDefSkip().asLyXCommand();
+			lengthToWidgets(textLayoutModule->skipLE,
+				textLayoutModule->skipLengthCO,
+				length, defaultUnit);
+			break;
+			}
+		default:
+			skip = 0;
+			break;
+		}
+		textLayoutModule->skipCO->setCurrentIndex(skip);
+		setSkip(skip);
 	}
-	textLayoutModule->skipCO->setCurrentIndex(skip);
-	setSkip(skip);
 
 	textLayoutModule->twoColumnCB->setChecked(
 		bp_.columns == 2);
 
-	// break listings_params to multiple lines
-	string lstparams =
-		InsetListingsParams(bp_.listings_params).separatedParams();
-	textLayoutModule->listingsED->setPlainText(toqstr(lstparams));
-
 	if (!bp_.options.empty()) {
 		latexModule->optionsLE->setText(
 			toqstr(bp_.options));
@@ -2018,6 +2454,11 @@ void GuiDocument::paramsToDialog()
 	// latex
 	latexModule->defaultOptionsCB->setChecked(
 			bp_.use_default_options);
+	updateSelectedModules();
+	selectionManager->updateProvidedModules(
+			bp_.baseClass()->providedModules());
+	selectionManager->updateExcludedModules(
+			bp_.baseClass()->excludedModules());
 
 	if (!documentClass().options().empty()) {
 		latexModule->defaultOptionsLE->setText(
@@ -2043,28 +2484,94 @@ void GuiDocument::paramsToDialog()
 		latexModule->childDocGB->setChecked(false);
 	}
 
+	// Master/Child
+	std::vector<Buffer *> children = buffer().getChildren(false);
+	if (children.empty()) {
+		masterChildModule->childrenTW->clear();
+		includeonlys_.clear();
+		docPS->showPanel(qt_("Child Documents"), false);
+		if (docPS->isCurrentPanel(qt_("Child Documents")))
+			docPS->setCurrentPanel(qt_("Document Class"));
+	} else {
+		docPS->showPanel(qt_("Child Documents"), true);
+		masterChildModule->setEnabled(true);
+		includeonlys_ = bp_.getIncludedChildren();
+		updateIncludeonlys();
+	}
+	masterChildModule->maintainAuxCB->setChecked(
+		bp_.maintain_unincluded_children);
+
+	// Float Settings
 	floatModule->set(bp_.float_placement);
 
+	// ListingsSettings
+	// break listings_params to multiple lines
+	string lstparams =
+		InsetListingsParams(bp_.listings_params).separatedParams();
+	listingsModule->listingsED->setPlainText(toqstr(lstparams));
+
+	// Output
+	// update combobox with formats
+	updateDefaultFormat();
+	int index = outputModule->defaultFormatCO->findData(toqstr(
+		bp_.defaultOutputFormat));
+	// set to default if format is not found 
+	if (index == -1)
+		index = 0;
+	outputModule->defaultFormatCO->setCurrentIndex(index);
+	outputModule->xetexCB->setEnabled(bp_.baseClass()->outputType() == lyx::LATEX);
+	outputModule->xetexCB->setChecked(
+		bp_.baseClass()->outputType() == lyx::LATEX && bp_.useXetex);
+
 	// Fonts
 	updateFontsize(documentClass().opt_fontsize(),
 			bp_.fontsize);
 
-	int n = findToken(tex_fonts_roman, bp_.fontsRoman);
-	if (n >= 0) {
-		fontModule->fontsRomanCO->setCurrentIndex(n);
-		romanChanged(n);
-	}
-
-	n = findToken(tex_fonts_sans, bp_.fontsSans);
-	if (n >= 0)	{
-		fontModule->fontsSansCO->setCurrentIndex(n);
-		sansChanged(n);
-	}
-
-	n = findToken(tex_fonts_monospaced, bp_.fontsTypewriter);
-	if (n >= 0) {
-		fontModule->fontsTypewriterCO->setCurrentIndex(n);
-		ttChanged(n);
+	if (bp_.useXetex) {
+		fontModule->fontencLA->setEnabled(false);
+		fontModule->fontencCO->setEnabled(false);
+		fontModule->fontencLE->setEnabled(false);
+		for (int i = 0; i < fontModule->fontsRomanCO->count(); ++i) {
+			if (fontModule->fontsRomanCO->itemText(i) == toqstr(bp_.fontsRoman)) {
+				fontModule->fontsRomanCO->setCurrentIndex(i);
+				return;
+			}
+		}
+		
+		for (int i = 0; i < fontModule->fontsSansCO->count(); ++i) {
+			if (fontModule->fontsSansCO->itemText(i) == toqstr(bp_.fontsSans)) {
+				fontModule->fontsSansCO->setCurrentIndex(i);
+				return;
+			}
+		}
+		for (int i = 0; i < fontModule->fontsTypewriterCO->count(); ++i) {
+			if (fontModule->fontsTypewriterCO->itemText(i) == 
+				toqstr(bp_.fontsTypewriter)) {
+				fontModule->fontsTypewriterCO->setCurrentIndex(i);
+				return;
+			}
+		}
+	} else {
+		fontModule->fontencLA->setEnabled(true);
+		fontModule->fontencCO->setEnabled(true);
+		fontModule->fontencLE->setEnabled(true);
+		int n = findToken(tex_fonts_roman, bp_.fontsRoman);
+		if (n >= 0) {
+			fontModule->fontsRomanCO->setCurrentIndex(n);
+			romanChanged(n);
+		}
+	
+		n = findToken(tex_fonts_sans, bp_.fontsSans);
+		if (n >= 0) {
+			fontModule->fontsSansCO->setCurrentIndex(n);
+			sansChanged(n);
+		}
+	
+		n = findToken(tex_fonts_monospaced, bp_.fontsTypewriter);
+		if (n >= 0) {
+			fontModule->fontsTypewriterCO->setCurrentIndex(n);
+			ttChanged(n);
+		}
 	}
 
 	if (!bp_.fontsCJK.empty())
@@ -2077,27 +2584,44 @@ void GuiDocument::paramsToDialog()
 	fontModule->fontOsfCB->setChecked(bp_.fontsOSF);
 	fontModule->scaleSansSB->setValue(bp_.fontsSansScale);
 	fontModule->scaleTypewriterSB->setValue(bp_.fontsTypewriterScale);
-	n = findToken(GuiDocument::fontfamilies, bp_.fontsDefaultFamily);
-	if (n >= 0)
-		fontModule->fontsDefaultCO->setCurrentIndex(n);
+
+	int nn = findToken(GuiDocument::fontfamilies, bp_.fontsDefaultFamily);
+	if (nn >= 0)
+		fontModule->fontsDefaultCO->setCurrentIndex(nn);
+
+	if (bp_.fontenc == "global")
+		fontModule->fontencCO->setCurrentIndex(0);
+	else if (bp_.fontenc == "default")
+		fontModule->fontencCO->setCurrentIndex(2);
+	else {
+		fontModule->fontencCO->setCurrentIndex(1);
+		fontModule->fontencLE->setText(toqstr(bp_.fontenc));
+	}
 
 	// paper
+	bool const extern_geometry =
+		documentClass().provides("geometry");
 	int const psize = bp_.papersize;
 	pageLayoutModule->papersizeCO->setCurrentIndex(psize);
-	setCustomPapersize(psize);
+	setCustomPapersize(!extern_geometry && psize == 1);
+	pageLayoutModule->papersizeCO->setEnabled(!extern_geometry);
 
 	bool const landscape =
 		bp_.orientation == ORIENTATION_LANDSCAPE;
 	pageLayoutModule->landscapeRB->setChecked(landscape);
 	pageLayoutModule->portraitRB->setChecked(!landscape);
+	pageLayoutModule->landscapeRB->setEnabled(!extern_geometry);
+	pageLayoutModule->portraitRB->setEnabled(!extern_geometry);
 
 	pageLayoutModule->facingPagesCB->setChecked(
 		bp_.sides == TwoSides);
 
+	pageLayoutModule->backgroundPB->setStyleSheet(
+		colorButtonStyleSheet(rgb2qcolor(bp_.backgroundcolor)));
+	set_backgroundcolor = bp_.backgroundcolor;
 
 	lengthToWidgets(pageLayoutModule->paperwidthLE,
 		pageLayoutModule->paperwidthUnitCO, bp_.paperwidth, defaultUnit);
-
 	lengthToWidgets(pageLayoutModule->paperheightLE,
 		pageLayoutModule->paperheightUnitCO, bp_.paperheight, defaultUnit);
 
@@ -2130,6 +2654,8 @@ void GuiDocument::paramsToDialog()
 	lengthToWidgets(m->columnsepLE, m->columnsepUnit,
 		bp_.columnsep, defaultUnit);
 
+	// branches
+	updateUnknownBranches();
 	branchesModule->update(bp_);
 
 	// PDF support
@@ -2151,21 +2677,22 @@ void GuiDocument::paramsToDialog()
 	pdfSupportModule->pdfusetitleCB->setChecked(pdf.pdfusetitle);
 	pdfSupportModule->colorlinksCB->setChecked(pdf.colorlinks);
 
-	n = findToken(backref_opts, pdf.backref);
-	if (n >= 0)
-		pdfSupportModule->backrefCO->setCurrentIndex(n);
+	nn = findToken(backref_opts, pdf.backref);
+	if (nn >= 0)
+		pdfSupportModule->backrefCO->setCurrentIndex(nn);
 
 	pdfSupportModule->fullscreenCB->setChecked
 		(pdf.pagemode == pdf.pagemode_fullscreen);
 
 	pdfSupportModule->optionsLE->setText(
 		toqstr(pdf.quoted_options));
-}
 
+	// Make sure that the bc is in the INITIAL state
+	if (bc().policy().buttonStatus(ButtonPolicy::RESTORE))
+		bc().restore();
 
-void GuiDocument::applyView()
-{
-	apply(params());
+	// clear changed branches cache
+	changedBranches_.clear();
 }
 
 
@@ -2201,6 +2728,54 @@ void GuiDocument::updateSelectedModules()
 }
 
 
+void GuiDocument::updateIncludeonlys()
+{
+	masterChildModule->childrenTW->clear();
+	QString const no = qt_("No");
+	QString const yes = qt_("Yes");
+
+	if (includeonlys_.empty()) {
+		masterChildModule->includeallRB->setChecked(true);
+		masterChildModule->childrenTW->setEnabled(false);
+		masterChildModule->maintainAuxCB->setEnabled(false);
+	} else {
+		masterChildModule->includeonlyRB->setChecked(true);
+		masterChildModule->childrenTW->setEnabled(true);
+		masterChildModule->maintainAuxCB->setEnabled(true);
+	}
+	QTreeWidgetItem * item = 0;
+	std::vector<Buffer *> children = buffer().getChildren(false);
+	vector<Buffer *>::const_iterator it  = children.begin();
+	vector<Buffer *>::const_iterator end = children.end();
+	bool has_unincluded = false;
+	bool all_unincluded = true;
+	for (; it != end; ++it) {
+		item = new QTreeWidgetItem(masterChildModule->childrenTW);
+		// FIXME Unicode
+		string const name =
+			to_utf8(makeRelPath(from_utf8((*it)->fileName().absFilename()),
+							from_utf8(buffer().filePath())));
+		item->setText(0, toqstr(name));
+		item->setText(1, isChildIncluded(name) ? yes : no);
+		if (!isChildIncluded(name))
+			has_unincluded = true;
+		else
+			all_unincluded = false;
+	}
+	// Both if all childs are included and if none is included
+	// is equal to "include all" (i.e., ommit \includeonly).
+	// Thus, reset the GUI.
+	if (!has_unincluded || all_unincluded) {
+		masterChildModule->includeallRB->setChecked(true);
+		masterChildModule->childrenTW->setEnabled(false);
+		includeonlys_.clear();
+	}
+	// If all are included, we need to update again.
+	if (!has_unincluded)
+		updateIncludeonlys();
+}
+
+
 void GuiDocument::updateContents()
 {
 	// Nothing to do here as the document settings is not cursor dependant.
@@ -2245,7 +2820,11 @@ bool GuiDocument::isValid()
 {
 	return validateListingsParameters().isEmpty()
 		&& (textLayoutModule->skipCO->currentIndex() != 3
-			|| !textLayoutModule->skipLE->text().isEmpty());
+			|| !textLayoutModule->skipLE->text().isEmpty()
+			|| textLayoutModule->indentRB->isChecked())
+		&& (textLayoutModule->indentCO->currentIndex() != 1
+			|| !textLayoutModule->indentLE->text().isEmpty()
+			|| textLayoutModule->skipRB->isChecked());
 }
 
 
@@ -2270,7 +2849,6 @@ bool GuiDocument::initialiseParams(string const &)
 	bp_ = view->buffer().params();
 	loadModuleInfo();
 	updateAvailableModules();
-	updateSelectedModules();
 	//FIXME It'd be nice to make sure here that the selected
 	//modules are consistent: That required modules are actually
 	//selected, and that we don't have conflicts. If so, we could
@@ -2299,18 +2877,19 @@ list<GuiDocument::modInfoStruct> const & GuiDocument::getModuleInfo()
 }
 
 
-list<GuiDocument::modInfoStruct> const GuiDocument::getSelectedModules()
+list<GuiDocument::modInfoStruct> const 
+		GuiDocument::makeModuleInfo(LayoutModuleList const & mods)
 {
-	list<string> const & mods = params().getModules();
-	list<string>::const_iterator it =  mods.begin();
-	list<string>::const_iterator end = mods.end();
+	LayoutModuleList::const_iterator it =  mods.begin();
+	LayoutModuleList::const_iterator end = mods.end();
 	list<modInfoStruct> mInfo;
 	for (; it != end; ++it) {
 		modInfoStruct m;
 		m.id = *it;
-		LyXModule * mod = moduleList[*it];
+		LyXModule const * const mod = theModuleList[*it];
 		if (mod)
-			m.name = qt_(mod->getName());
+			// FIXME Unicode
+			m.name = toqstr(translateIfPossible(from_utf8(mod->getName())));
 		else 
 			m.name = toqstr(*it) + toqstr(" (") + qt_("Not Found") + toqstr(")");
 		mInfo.push_back(m);
@@ -2319,6 +2898,18 @@ list<GuiDocument::modInfoStruct> const GuiDocument::getSelectedModules()
 }
 
 
+list<GuiDocument::modInfoStruct> const GuiDocument::getSelectedModules()
+{
+	return makeModuleInfo(params().getModules());
+}
+
+
+list<GuiDocument::modInfoStruct> const GuiDocument::getProvidedModules()
+{
+	return makeModuleInfo(params().baseClass()->providedModules());
+}
+
+
 DocumentClass const & GuiDocument::documentClass() const
 {
 	return bp_.documentClass();
@@ -2350,7 +2941,19 @@ void GuiDocument::dispatchParams()
 			   support::onlyPath(buffer().absFileName()));
 		if (isLyXFilename(master_file.absFilename())) {
 			Buffer * master = checkAndLoadLyXFile(master_file);
-			const_cast<Buffer &>(buffer()).setParent(master);
+			if (master) {
+				if (master->isChild(const_cast<Buffer *>(&buffer())))
+					const_cast<Buffer &>(buffer()).setParent(master);
+				else
+					Alert::warning(_("Assigned master does not include this file"), 
+						bformat(_("You must include this file in the document\n"
+							  "'%1$s' in order to use the master document\n"
+							  "feature."), from_utf8(params().master)));
+			} else
+				Alert::warning(_("Could not load master"), 
+						bformat(_("The master document '%1$s'\n"
+							   "could not be loaded."),
+							   from_utf8(params().master)));
 		}
 	}
 
@@ -2372,6 +2975,25 @@ void GuiDocument::dispatchParams()
 		dispatch(FuncRequest(LFUN_ALL_INSETS_TOGGLE,
 			"assign branch"));
 	}
+	// rename branches in the document
+	executeBranchRenaming();
+	// and clear changed branches cache
+	changedBranches_.clear();
+	
+	// Generate the colours requested by indices.
+	IndicesList & indiceslist = params().indiceslist();
+	if (!indiceslist.empty()) {
+		IndicesList::const_iterator it = indiceslist.begin();
+		IndicesList::const_iterator const end = indiceslist.end();
+		for (; it != end; ++it) {
+			docstring const & current_index = it->shortcut();
+			Index const * index = indiceslist.findShortcut(current_index);
+			string const x11hexname = X11hexname(index->color());
+			// display the new color
+			docstring const str = current_index + ' ' + from_ascii(x11hexname);
+			dispatch(FuncRequest(LFUN_SET_COLOR, str));
+		}
+	}
 	// FIXME: If we used an LFUN, we would not need those two lines:
 	BufferView * bv = const_cast<BufferView *>(bufferview());
 	bv->processUpdateFlags(Update::Force | Update::FitCursor);
@@ -2420,6 +3042,10 @@ bool GuiDocument::isFontAvailable(string const & font) const
 
 bool GuiDocument::providesOSF(string const & font) const
 {
+	if (outputModule->xetexCB->isChecked())
+		// FIXME: we should check if the fonts really
+		// have OSF support. But how?
+		return true;
 	if (font == "cmr")
 		return isFontAvailable("eco");
 	if (font == "palatino")
@@ -2430,6 +3056,8 @@ bool GuiDocument::providesOSF(string const & font) const
 
 bool GuiDocument::providesSC(string const & font) const
 {
+	if (outputModule->xetexCB->isChecked())
+		return false;
 	if (font == "palatino")
 		return isFontAvailable("mathpazo");
 	if (font == "utopia")
@@ -2440,6 +3068,8 @@ bool GuiDocument::providesSC(string const & font) const
 
 bool GuiDocument::providesScale(string const & font) const
 {
+	if (outputModule->xetexCB->isChecked())
+		return true;
 	return font == "helvet" || font == "luximono"
 		|| font == "berasans"  || font == "beramono";
 }
@@ -2448,14 +3078,17 @@ bool GuiDocument::providesScale(string const & font) const
 void GuiDocument::loadModuleInfo()
 {
 	moduleNames_.clear();
-	LyXModuleList::const_iterator it  = moduleList.begin();
-	LyXModuleList::const_iterator end = moduleList.end();
+	LyXModuleList::const_iterator it  = theModuleList.begin();
+	LyXModuleList::const_iterator end = theModuleList.end();
 	for (; it != end; ++it) {
 		modInfoStruct m;
 		m.id = it->getID();
-		m.name = qt_(it->getName());
+		// FIXME Unicode
+		m.name = toqstr(translateIfPossible(from_utf8(it->getName())));
 		// this is supposed to give us the first sentence of the description
-		QString desc = qt_(it->getDescription());
+		// FIXME Unicode
+		QString desc =
+			toqstr(translateIfPossible(from_utf8(it->getDescription())));
 		int const pos = desc.indexOf(".");
 		if (pos > 0)
 			desc.truncate(pos + 1);
@@ -2465,10 +3098,49 @@ void GuiDocument::loadModuleInfo()
 }
 
 
+void GuiDocument::updateUnknownBranches()
+{
+	list<docstring> used_branches;
+	buffer().getUsedBranches(used_branches);
+	list<docstring>::const_iterator it = used_branches.begin();
+	QStringList unknown_branches;
+	for (; it != used_branches.end() ; ++it) {
+		if (!buffer().params().branchlist().find(*it))
+			unknown_branches.append(toqstr(*it));
+	}
+	branchesModule->setUnknownBranches(unknown_branches);
+}
+
+
+void GuiDocument::branchesRename(docstring const & oldname, docstring const & newname)
+{
+	map<docstring, docstring>::iterator it = changedBranches_.begin();
+	for (; it != changedBranches_.end() ; ++it) {
+		if (it->second == oldname) {
+			// branch has already been renamed
+			it->second = newname;
+			return;
+		}
+	}
+	// store new name
+	changedBranches_[oldname] = newname;
+}
+
+
+void GuiDocument::executeBranchRenaming() const
+{
+	map<docstring, docstring>::const_iterator it = changedBranches_.begin();
+	for (; it != changedBranches_.end() ; ++it) {
+		docstring const arg = '"' + it->first + '"' + " " + '"' + it->second + '"';
+		dispatch(FuncRequest(LFUN_BRANCHES_RENAME, arg));
+	}
+}
+
+
 Dialog * createGuiDocument(GuiView & lv) { return new GuiDocument(lv); }
 
 
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiDocument_moc.cpp"
+#include "moc_GuiDocument.cpp"