X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiDocument.cpp;h=31d2c14b7a8c54a859c39df4e44d068a689c1af5;hb=39d569661a3f4411d4501f9a8db9c7360ef5d568;hp=7aeac973d1a4d02adf22243582df41d85839f47b;hpb=17986e7509f05a79446423a9a32c762cb19a3429;p=lyx.git

diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index 7aeac973d1..31d2c14b7a 100644
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -34,6 +34,7 @@
 #include "FloatPlacement.h"
 #include "Format.h"
 #include "FuncRequest.h"
+#include "HSpace.h"
 #include "IndicesList.h"
 #include "Language.h"
 #include "LaTeXFeatures.h"
@@ -45,6 +46,7 @@
 #include "PDFOptions.h"
 #include "qt_helpers.h"
 #include "Spacing.h"
+#include "TextClass.h"
 
 #include "insets/InsetListingsParams.h"
 
@@ -57,6 +59,7 @@
 #include "frontends/alert.h"
 
 #include <QAbstractItemModel>
+#include <QHeaderView>
 #include <QColor>
 #include <QColorDialog>
 #include <QCloseEvent>
@@ -77,7 +80,7 @@
 static inline QString colorButtonStyleSheet(QColor const & bgColor)
 {
 	if (bgColor.isValid()) {
-		QString rc = QLatin1String("background:");
+		QString rc = QLatin1String("background-color:");
 		rc += bgColor.name();
 		return rc;
 	}
@@ -176,6 +179,11 @@ vector<pair<string, QString> > pagestyles;
 namespace lyx {
 
 RGBColor set_backgroundcolor;
+bool is_backgroundcolor;
+RGBColor set_fontcolor;
+bool is_fontcolor;
+RGBColor set_notefontcolor;
+RGBColor set_boxbgcolor;
 
 namespace {
 // used when sorting the textclass list.
@@ -190,11 +198,11 @@ public:
 		//   2. Description (lexicographic)
 		LayoutFile const & tc1 = LayoutFileList::get()[lhs];
 		LayoutFile const & tc2 = LayoutFileList::get()[rhs];
-		int const rel = compare_no_case(
+		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() && rel < 0);
+			(tc1.isTeXClassAvailable() == tc2.isTeXClassAvailable() && order < 0);
 	}
 };
 
@@ -205,7 +213,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();
@@ -214,7 +222,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();
@@ -223,7 +231,7 @@ 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!");
 	// FIXME Unicode
@@ -233,7 +241,7 @@ docstring getModuleDescription(string const & modName)
 
 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();
@@ -242,7 +250,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();
@@ -263,7 +271,7 @@ class ModuleSelectionManager : public GuiSelectionManager
 public:
 	///
 	ModuleSelectionManager(
-		QListView * availableLV, 
+		QTreeView * availableLV,
 		QListView * selectedLV,
 		QPushButton * addPB, 
 		QPushButton * delPB, 
@@ -301,9 +309,9 @@ private:
 		return dynamic_cast<GuiIdListModel *>(selectedModel);
 	}
 	/// keeps a list of the modules the text class provides
-	std::list<std::string> provided_modules_;
+	list<string> provided_modules_;
 	/// similarly...
-	std::list<std::string> excluded_modules_;
+	list<string> excluded_modules_;
 	/// 
 	GuiDocument const * container_;
 };
@@ -432,26 +440,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;
+		// 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;
+				// 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;
+			// 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);
 }
 
@@ -518,6 +526,118 @@ void PreambleModule::closeEvent(QCloseEvent * e)
 }
 
 
+/////////////////////////////////////////////////////////////////////
+//
+// LocalLayout
+//
+/////////////////////////////////////////////////////////////////////
+
+
+LocalLayout::LocalLayout() : current_id_(0), is_valid_(false)
+{
+	connect(locallayoutTE, SIGNAL(textChanged()), this, SLOT(textChanged()));
+	connect(validatePB, SIGNAL(clicked()), this, SLOT(validatePressed()));
+	connect(convertPB, SIGNAL(clicked()), this, SLOT(convertPressed()));
+}
+
+
+void LocalLayout::update(BufferParams const & params, BufferId id)
+{
+	QString layout = toqstr(params.local_layout);
+	// Nothing to do if the params and preamble are unchanged.
+	if (id == current_id_
+		&& layout == locallayoutTE->document()->toPlainText())
+		return;
+
+	// Save the params address for further use.
+	current_id_ = id;
+	locallayoutTE->document()->setPlainText(layout);
+	validate();
+}
+
+
+void LocalLayout::apply(BufferParams & params)
+{
+	string const layout = fromqstr(locallayoutTE->document()->toPlainText());
+	params.local_layout = layout;
+}
+
+
+void LocalLayout::textChanged()
+{
+	static const QString unknown = qt_("Press button to check validity...");
+
+	is_valid_ = false;
+	validLB->setText(unknown);
+	validatePB->setEnabled(true);
+	convertPB->setEnabled(false);
+	changed();
+}
+
+
+void LocalLayout::convert() {
+	string const layout =
+		fromqstr(locallayoutTE->document()->toPlainText().trimmed());
+	string const newlayout = TextClass::convert(layout);
+	LYXERR0(newlayout);
+	if (newlayout.empty()) {
+		Alert::error(_("Conversion Failed!"),
+		      _("Failed to convert local layout to current format."));
+	} else {
+		locallayoutTE->setPlainText(toqstr(newlayout));
+	}
+	validate();
+}
+
+
+void LocalLayout::convertPressed() {
+	convert();
+	changed();
+}
+
+
+void LocalLayout::validate() {
+	static const QString valid = qt_("Layout is valid!");
+	static const QString vtext =
+		toqstr("<p style=\"font-weight: bold; \">") 
+		  + valid + toqstr("</p>");
+	static const QString invalid = qt_("Layout is invalid!");
+	static const QString ivtext =
+		toqstr("<p style=\"color: #c00000; font-weight: bold; \">") 
+		  + invalid + toqstr("</p>");
+
+	string const layout = 
+		fromqstr(locallayoutTE->document()->toPlainText().trimmed());
+	if (layout.empty()) {
+		is_valid_ = true;
+		validatePB->setEnabled(false);
+		validLB->setText("");
+		convertPB->hide();
+		convertLB->hide();
+	} else {
+		TextClass::ReturnValues const ret = TextClass::validate(layout);
+		is_valid_ = (ret == TextClass::OK) || (ret == TextClass::OK_OLDFORMAT);
+		validatePB->setEnabled(false);
+		validLB->setText(is_valid_ ? vtext : ivtext);
+		if (ret == TextClass::OK_OLDFORMAT) {
+			convertPB->show();
+			convertPB->setEnabled(true);
+			convertLB->setText(qt_("Convert to current format"));
+			convertLB->show();
+		} else {
+			convertPB->hide();
+			convertLB->hide();
+		}
+	}
+}
+
+
+void LocalLayout::validatePressed() {
+	validate();
+	changed();
+}
+
+
 /////////////////////////////////////////////////////////////////////
 //
 // DocumentDialog
@@ -545,53 +665,65 @@ GuiDocument::GuiDocument(GuiView & lv)
 	bc().setCancel(closePB);
 	bc().setRestore(restorePB);
 
-	textLayoutModule = new UiWidget<Ui::TextLayoutUi>;
+
 	// text layout
+	textLayoutModule = new UiWidget<Ui::TextLayoutUi>;
 	connect(textLayoutModule->lspacingCO, SIGNAL(activated(int)),
 		this, SLOT(change_adaptor()));
 	connect(textLayoutModule->lspacingCO, SIGNAL(activated(int)),
 		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,22 +732,63 @@ 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);
 
+
+	// 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()));
+	connect(outputModule->mathimgSB, SIGNAL(valueChanged(double)),
+		this, SLOT(change_adaptor()));
+	connect(outputModule->strictCB, SIGNAL(stateChanged(int)),
+		this, SLOT(change_adaptor()));
+	connect(outputModule->mathoutCB, SIGNAL(currentIndexChanged(int)),
+		this, SLOT(change_adaptor()));
+
+	connect(outputModule->outputsyncCB, SIGNAL(clicked()),
+		this, SLOT(change_adaptor()));
+	connect(outputModule->synccustomCB, SIGNAL(editTextChanged(QString)),
+		this, SLOT(change_adaptor()));
+	outputModule->synccustomCB->addItem("");
+	outputModule->synccustomCB->addItem("\\synctex=1");
+	outputModule->synccustomCB->addItem("\\synctex=-1");
+	outputModule->synccustomCB->addItem("\\usepackage[active]{srcltx}");
+
+	outputModule->synccustomCB->setValidator(new NoNewLineValidator(
+		outputModule->synccustomCB));
 
 	// fonts
 	fontModule = new UiWidget<Ui::FontUi>;
+	connect(fontModule->osFontsCB, SIGNAL(clicked()),
+		this, SLOT(change_adaptor()));
+	connect(fontModule->osFontsCB, SIGNAL(toggled(bool)),
+		this, SLOT(osFontsChanged(bool)));
 	connect(fontModule->fontsRomanCO, SIGNAL(activated(int)),
 		this, SLOT(change_adaptor()));
 	connect(fontModule->fontsRomanCO, SIGNAL(activated(int)),
@@ -630,6 +803,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 &)),
@@ -643,6 +822,11 @@ GuiDocument::GuiDocument(GuiView & lv)
 	connect(fontModule->fontOsfCB, SIGNAL(clicked()),
 		this, SLOT(change_adaptor()));
 
+	fontModule->fontencLE->setValidator(new NoNewLineValidator(
+		fontModule->fontencLE));
+	fontModule->cjkFontLE->setValidator(new NoNewLineValidator(
+		fontModule->cjkFontLE));
+
 	updateFontlist();
 
 	fontModule->fontsizeCO->addItem(qt_("Default"));
@@ -650,19 +834,28 @@ GuiDocument::GuiDocument(GuiView & lv)
 	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]));
 
+	if (!LaTeXFeatures::isAvailable("fontspec"))
+		fontModule->osFontsCB->setToolTip(
+			qt_("Use OpenType and TrueType fonts directly (requires XeTeX or LuaTeX)\n"
+			    "You need to install the package \"fontspec\" to use this feature"));
+
 
-	pageLayoutModule = new UiWidget<Ui::PageLayoutUi>;
 	// page layout
+	pageLayoutModule = new UiWidget<Ui::PageLayoutUi>;
 	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()));
+		this, SLOT(change_adaptor()));
 	connect(pageLayoutModule->papersizeCO, SIGNAL(activated(int)),
 		this, SLOT(change_adaptor()));
 	connect(pageLayoutModule->paperheightLE, SIGNAL(textChanged(const QString &)),
@@ -681,11 +874,7 @@ 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"));
 	pageLayoutModule->pagestyleCO->addItem(qt_("plain"));
@@ -696,19 +885,40 @@ GuiDocument::GuiDocument(GuiView & lv)
 	bc().addCheckedLineEdit(pageLayoutModule->paperwidthLE,
 		pageLayoutModule->paperwidthL);
 
-	// paper
 	QComboBox * cb = pageLayoutModule->papersizeCO;
 	cb->addItem(qt_("Default"));
 	cb->addItem(qt_("Custom"));
 	cb->addItem(qt_("US letter"));
 	cb->addItem(qt_("US legal"));
 	cb->addItem(qt_("US executive"));
+	cb->addItem(qt_("A0"));
+	cb->addItem(qt_("A1"));
+	cb->addItem(qt_("A2"));
 	cb->addItem(qt_("A3"));
 	cb->addItem(qt_("A4"));
 	cb->addItem(qt_("A5"));
+	cb->addItem(qt_("A6"));
+	cb->addItem(qt_("B0"));
+	cb->addItem(qt_("B1"));
+	cb->addItem(qt_("B2"));
 	cb->addItem(qt_("B3"));
 	cb->addItem(qt_("B4"));
 	cb->addItem(qt_("B5"));
+	cb->addItem(qt_("B6"));
+	cb->addItem(qt_("C0"));
+	cb->addItem(qt_("C1"));
+	cb->addItem(qt_("C2"));
+	cb->addItem(qt_("C3"));
+	cb->addItem(qt_("C4"));
+	cb->addItem(qt_("C5"));
+	cb->addItem(qt_("C6"));
+	cb->addItem(qt_("JIS B0"));
+	cb->addItem(qt_("JIS B1"));
+	cb->addItem(qt_("JIS B2"));
+	cb->addItem(qt_("JIS B3"));
+	cb->addItem(qt_("JIS B4"));
+	cb->addItem(qt_("JIS B5"));
+	cb->addItem(qt_("JIS B6"));
 	// remove the %-items from the unit choice
 	pageLayoutModule->paperwidthUnitCO->noPercents();
 	pageLayoutModule->paperheightUnitCO->noPercents();
@@ -718,8 +928,8 @@ GuiDocument::GuiDocument(GuiView & lv)
 		pageLayoutModule->paperwidthLE));
 
 
-	marginsModule = new UiWidget<Ui::MarginsUi>;
 	// margins
+	marginsModule = new UiWidget<Ui::MarginsUi>;
 	connect(marginsModule->marginCB, SIGNAL(toggled(bool)),
 		this, SLOT(setCustomMargins(bool)));
 	connect(marginsModule->marginCB, SIGNAL(clicked()),
@@ -791,8 +1001,8 @@ GuiDocument::GuiDocument(GuiView & lv)
 		marginsModule->columnsepL);
 
 
-	langModule = new UiWidget<Ui::LanguageUi>;
 	// language & quote
+	langModule = new UiWidget<Ui::LanguageUi>;
 	connect(langModule->languageCO, SIGNAL(activated(int)),
 		this, SLOT(change_adaptor()));
 	connect(langModule->defaultencodingRB, SIGNAL(clicked()),
@@ -803,11 +1013,21 @@ GuiDocument::GuiDocument(GuiView & lv)
 		this, SLOT(change_adaptor()));
 	connect(langModule->quoteStyleCO, SIGNAL(activated(int)),
 		this, SLOT(change_adaptor()));
-	// language & quotes
+	connect(langModule->languagePackageCO, SIGNAL(activated(int)),
+		this, SLOT(change_adaptor()));
+	connect(langModule->languagePackageLE, SIGNAL(textChanged(QString)),
+		this, SLOT(change_adaptor()));
+	connect(langModule->languagePackageCO, SIGNAL(currentIndexChanged(int)),
+		this, SLOT(languagePackageChanged(int)));
+
+	langModule->languagePackageLE->setValidator(new NoNewLineValidator(
+		langModule->languagePackageLE));
+
 	QAbstractItemModel * language_model = guiApp->languageModel();
 	// FIXME: it would be nice if sorting was enabled/disabled via a checkbox.
 	language_model->sort(0);
 	langModule->languageCO->setModel(language_model);
+	langModule->languageCO->setModelColumn(0);
 
 	// Always put the default encoding in the first position.
 	langModule->encodingCO->addItem(qt_("Language Default (no inputenc)"));
@@ -826,9 +1046,40 @@ GuiDocument::GuiDocument(GuiView & lv)
 	langModule->quoteStyleCO->addItem(qt_("<<text>>"));
 	langModule->quoteStyleCO->addItem(qt_(">>text<<"));
 
+	langModule->languagePackageCO->addItem(
+		qt_("Default"), toqstr("default"));
+	langModule->languagePackageCO->addItem(
+		qt_("Automatic"), toqstr("auto"));
+	langModule->languagePackageCO->addItem(
+		qt_("Always Babel"), toqstr("babel"));
+	langModule->languagePackageCO->addItem(
+		qt_("Custom"), toqstr("custom"));
+	langModule->languagePackageCO->addItem(
+		qt_("None[[language package]]"), toqstr("none"));
+
+
+	// color
+	colorModule = new UiWidget<Ui::ColorUi>;
+	connect(colorModule->fontColorPB, SIGNAL(clicked()),
+		this, SLOT(changeFontColor()));
+	connect(colorModule->delFontColorTB, SIGNAL(clicked()),
+		this, SLOT(deleteFontColor()));
+	connect(colorModule->noteFontColorPB, SIGNAL(clicked()),
+		this, SLOT(changeNoteFontColor()));
+	connect(colorModule->delNoteFontColorTB, SIGNAL(clicked()),
+		this, SLOT(deleteNoteFontColor()));
+	connect(colorModule->backgroundPB, SIGNAL(clicked()),
+		this, SLOT(changeBackgroundColor()));
+	connect(colorModule->delBackgroundTB, SIGNAL(clicked()),
+		this, SLOT(deleteBackgroundColor()));
+	connect(colorModule->boxBackgroundPB, SIGNAL(clicked()),
+		this, SLOT(changeBoxBackgroundColor()));
+	connect(colorModule->delBoxBackgroundTB, SIGNAL(clicked()),
+		this, SLOT(deleteBoxBackgroundColor()));
+
 
-	numberingModule = new UiWidget<Ui::NumberingUi>;
 	// numbering
+	numberingModule = new UiWidget<Ui::NumberingUi>;
 	connect(numberingModule->depthSL, SIGNAL(valueChanged(int)),
 		this, SLOT(change_adaptor()));
 	connect(numberingModule->tocSL, SIGNAL(valueChanged(int)),
@@ -841,14 +1092,15 @@ GuiDocument::GuiDocument(GuiView & lv)
 	numberingModule->tocTW->headerItem()->setText(0, qt_("Example"));
 	numberingModule->tocTW->headerItem()->setText(1, qt_("Numbered"));
 	numberingModule->tocTW->headerItem()->setText(2, qt_("Appears in TOC"));
+	numberingModule->tocTW->header()->setResizeMode(QHeaderView::ResizeToContents);
 
 
+	// biblio
 	biblioModule = new UiWidget<Ui::BiblioUi>;
 	connect(biblioModule->citeNatbibRB, SIGNAL(toggled(bool)),
 		biblioModule->citationStyleL, SLOT(setEnabled(bool)));
 	connect(biblioModule->citeNatbibRB, SIGNAL(toggled(bool)),
 		biblioModule->citeStyleCO, SLOT(setEnabled(bool)));
-	// biblio
 	connect(biblioModule->citeDefaultRB, SIGNAL(clicked()),
 		this, SLOT(change_adaptor()));
 	connect(biblioModule->citeNatbibRB, SIGNAL(clicked()),
@@ -861,15 +1113,18 @@ GuiDocument::GuiDocument(GuiView & lv)
 		this, SLOT(change_adaptor()));
 	connect(biblioModule->bibtexCO, SIGNAL(activated(int)),
 		this, SLOT(bibtexChanged(int)));
-	connect(biblioModule->bibtexOptionsED, SIGNAL(textChanged(QString)),
+	connect(biblioModule->bibtexOptionsLE, SIGNAL(textChanged(QString)),
 		this, SLOT(change_adaptor()));
-	// biblio
+
+	biblioModule->bibtexOptionsLE->setValidator(new NoNewLineValidator(
+		biblioModule->bibtexOptionsLE));
+
 	biblioModule->citeStyleCO->addItem(qt_("Author-year"));
 	biblioModule->citeStyleCO->addItem(qt_("Numerical"));
 	biblioModule->citeStyleCO->setCurrentIndex(0);
-	
-	biblioModule->bibtexCO->clear();
 
+	// NOTE: we do not provide "custom" here for security reasons!
+	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) {
@@ -877,18 +1132,26 @@ GuiDocument::GuiDocument(GuiView & lv)
 		biblioModule->bibtexCO->addItem(command, command);
 	}
 
+
 	// indices
 	indicesModule = new GuiIndices;
 	connect(indicesModule, SIGNAL(changed()),
 		this, SLOT(change_adaptor()));
 
 
+	// maths
 	mathsModule = new UiWidget<Ui::MathsUi>;
 	connect(mathsModule->amsautoCB, SIGNAL(toggled(bool)),
 		mathsModule->amsCB, SLOT(setDisabled(bool)));
 	connect(mathsModule->esintautoCB, SIGNAL(toggled(bool)),
 		mathsModule->esintCB, SLOT(setDisabled(bool)));
-	// maths
+	connect(mathsModule->mhchemautoCB, SIGNAL(toggled(bool)),
+		mathsModule->mhchemCB, SLOT(setDisabled(bool)));
+	connect(mathsModule->mathdotsautoCB, SIGNAL(toggled(bool)),
+		mathsModule->mathdotsCB, SLOT(setDisabled(bool)));
+	connect(mathsModule->undertildeautoCB, SIGNAL(toggled(bool)),
+		mathsModule->undertildeCB, SLOT(setDisabled(bool)));
+	
 	connect(mathsModule->amsCB, SIGNAL(clicked()),
 		this, SLOT(change_adaptor()));
 	connect(mathsModule->amsautoCB, SIGNAL(clicked()),
@@ -897,9 +1160,22 @@ 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()));
+	connect(mathsModule->mathdotsCB, SIGNAL(clicked()),
+		this, SLOT(change_adaptor()));
+	connect(mathsModule->mathdotsautoCB, SIGNAL(clicked()),
+		this, SLOT(change_adaptor()));
+	connect(mathsModule->undertildeCB, SIGNAL(clicked()),
+		this, SLOT(change_adaptor()));
+	connect(mathsModule->undertildeautoCB, SIGNAL(clicked()),
+		this, SLOT(change_adaptor()));
+	
 
-	latexModule = new UiWidget<Ui::LaTeXUi>;
 	// latex class
+	latexModule = new UiWidget<Ui::LaTeXUi>;
 	connect(latexModule->optionsLE, SIGNAL(textChanged(QString)),
 		this, SLOT(change_adaptor()));
 	connect(latexModule->defaultOptionsCB, SIGNAL(clicked()),
@@ -920,6 +1196,15 @@ GuiDocument::GuiDocument(GuiView & lv)
 		this, SLOT(change_adaptor()));
 	connect(latexModule->childDocPB, SIGNAL(clicked()),
 		this, SLOT(browseMaster()));
+	connect(latexModule->suppressDateCB, SIGNAL(clicked()),
+		this, SLOT(change_adaptor()));
+	connect(latexModule->refstyleCB, SIGNAL(clicked()),
+		this, SLOT(change_adaptor()));
+
+	latexModule->optionsLE->setValidator(new NoNewLineValidator(
+		latexModule->optionsLE));
+	latexModule->childDocLE->setValidator(new NoNewLineValidator(
+		latexModule->childDocLE));
 
 	// postscript drivers
 	for (int n = 0; tex_graphics[n][0]; ++n) {
@@ -942,25 +1227,37 @@ GuiDocument::GuiDocument(GuiView & lv)
 		classes_model_.insertRow(i, toqstr(item), *cit);
 	}
 
+
 	// branches
 	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;
 	connect(preambleModule, SIGNAL(changed()),
 		this, SLOT(change_adaptor()));
+	
+	localLayout = new LocalLayout;
+	connect(localLayout, SIGNAL(changed()),
+		this, SLOT(change_adaptor()));
+
 
 	// bullets
 	bulletsModule = new BulletsModule;
 	connect(bulletsModule, SIGNAL(changed()),
 		this, SLOT(change_adaptor()));
 
+
 	// Modules
 	modulesModule = new UiWidget<Ui::ModulesUi>;
-
+	modulesModule->availableLV->header()->setVisible(false);
+	modulesModule->availableLV->header()->setResizeMode(QHeaderView::ResizeToContents);
+	modulesModule->availableLV->header()->setStretchLastSection(false);
 	selectionManager =
 		new ModuleSelectionManager(modulesModule->availableLV,
 			modulesModule->selectedLV,
@@ -974,9 +1271,9 @@ GuiDocument::GuiDocument(GuiView & lv)
 	connect(selectionManager, SIGNAL(selectionChanged()),
 		this, SLOT(modulesChanged()));
 
+
 	// PDF support
 	pdfSupportModule = new UiWidget<Ui::PDFSupportUi>;
-
 	connect(pdfSupportModule->use_hyperrefGB, SIGNAL(toggled(bool)),
 		this, SLOT(change_adaptor()));
 	connect(pdfSupportModule->titleLE, SIGNAL(textChanged(QString)),
@@ -1010,27 +1307,59 @@ GuiDocument::GuiDocument(GuiView & lv)
 	connect(pdfSupportModule->optionsLE, SIGNAL(textChanged(QString)),
 		this, SLOT(change_adaptor()));
 
+	pdfSupportModule->titleLE->setValidator(new NoNewLineValidator(
+		pdfSupportModule->titleLE));
+	pdfSupportModule->authorLE->setValidator(new NoNewLineValidator(
+		pdfSupportModule->authorLE));
+	pdfSupportModule->subjectLE->setValidator(new NoNewLineValidator(
+		pdfSupportModule->subjectLE));
+	pdfSupportModule->keywordsLE->setValidator(new NoNewLineValidator(
+		pdfSupportModule->keywordsLE));
+	pdfSupportModule->optionsLE->setValidator(new NoNewLineValidator(
+		pdfSupportModule->optionsLE));
+
 	for (int i = 0; backref_opts[i][0]; ++i)
 		pdfSupportModule->backrefCO->addItem(qt_(backref_opts_gui[i]));
 
+
 	// float
 	floatModule = new FloatPlacement;
 	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."));
+
+
+	// add the panels
 	docPS->addPanel(latexModule, qt_("Document Class"));
+	docPS->addPanel(masterChildModule, qt_("Child Documents"));
 	docPS->addPanel(modulesModule, qt_("Modules"));
+	docPS->addPanel(localLayout, qt_("Local Layout"));
 	docPS->addPanel(fontModule, qt_("Fonts"));
 	docPS->addPanel(textLayoutModule, qt_("Text Layout"));
 	docPS->addPanel(pageLayoutModule, qt_("Page Layout"));
 	docPS->addPanel(marginsModule, qt_("Page Margins"));
 	docPS->addPanel(langModule, qt_("Language"));
+	docPS->addPanel(colorModule, qt_("Colors"));
 	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"));
@@ -1044,12 +1373,6 @@ GuiDocument::GuiDocument(GuiView & lv)
 }
 
 
-void GuiDocument::showPreamble()
-{
-	docPS->setCurrentPanel(qt_("LaTeX Preamble"));
-}
-
-
 void GuiDocument::saveDefaultClicked()
 {
 	saveDocDefault();
@@ -1068,6 +1391,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
@@ -1075,10 +1418,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());
@@ -1096,13 +1439,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);
 	}
 }
 
@@ -1113,31 +1456,45 @@ 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)
+void GuiDocument::setMargins()
 {
 	bool const extern_geometry =
 		documentClass().provides("geometry");
@@ -1145,17 +1502,21 @@ void GuiDocument::setMargins(bool custom)
 	if (extern_geometry) {
 		marginsModule->marginCB->setChecked(false);
 		setCustomMargins(true);
-		return;
+	} else {
+		marginsModule->marginCB->setChecked(!bp_.use_geometry);
+		setCustomMargins(!bp_.use_geometry);
 	}
-	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);
@@ -1209,60 +1570,153 @@ 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(
+	// set the button color and text
+	colorModule->backgroundPB->setStyleSheet(
 		colorButtonStyleSheet(newColor));
+	colorModule->backgroundPB->setText(qt_("&Change..."));
 	// save color
 	set_backgroundcolor = rgbFromHexName(fromqstr(newColor.name()));
+	is_backgroundcolor = true;
 	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 the button color back to default by setting an empty StyleSheet
+	colorModule->backgroundPB->setStyleSheet(QLatin1String(""));
+	// change button text
+	colorModule->backgroundPB->setText(qt_("&Default..."));
+	// save default color (white)
 	set_backgroundcolor = rgbFromHexName("#ffffff");
+	is_backgroundcolor = false;
+	changed();
+}
+
+
+void GuiDocument::changeFontColor()
+{
+	QColor const & newColor = QColorDialog::getColor(
+		rgb2qcolor(set_fontcolor), asQWidget());
+	if (!newColor.isValid())
+		return;
+	// set the button color and text
+	colorModule->fontColorPB->setStyleSheet(
+		colorButtonStyleSheet(newColor));
+	colorModule->fontColorPB->setText(qt_("&Change..."));
+	// save color
+	set_fontcolor = rgbFromHexName(fromqstr(newColor.name()));
+	is_fontcolor = true;
 	changed();
 }
 
 
-void GuiDocument::xetexChanged(bool xetex)
+void GuiDocument::deleteFontColor()
 {
+	// set the button color back to default by setting an empty StyleSheet
+	colorModule->fontColorPB->setStyleSheet(QLatin1String(""));
+	// change button text
+	colorModule->fontColorPB->setText(qt_("&Default..."));
+	// save default color (black)
+	set_fontcolor = rgbFromHexName("#000000");
+	is_fontcolor = false;
+	changed();
+}
+
+
+void GuiDocument::changeNoteFontColor()
+{
+	QColor const & newColor = QColorDialog::getColor(
+		rgb2qcolor(set_notefontcolor), asQWidget());
+	if (!newColor.isValid())
+		return;
+	// set the button color
+	colorModule->noteFontColorPB->setStyleSheet(
+		colorButtonStyleSheet(newColor));
+	// save color
+	set_notefontcolor = rgbFromHexName(fromqstr(newColor.name()));
+	changed();
+}
+
+
+void GuiDocument::deleteNoteFontColor()
+{
+	// set the button color back to pref
+	theApp()->getRgbColor(Color_greyedouttext, set_notefontcolor);
+	colorModule->noteFontColorPB->setStyleSheet(
+		colorButtonStyleSheet(rgb2qcolor(set_notefontcolor)));
+	changed();
+}
+
+
+void GuiDocument::changeBoxBackgroundColor()
+{
+	QColor const & newColor = QColorDialog::getColor(
+		rgb2qcolor(set_boxbgcolor), asQWidget());
+	if (!newColor.isValid())
+		return;
+	// set the button color
+	colorModule->boxBackgroundPB->setStyleSheet(
+		colorButtonStyleSheet(newColor));
+	// save color
+	set_boxbgcolor = rgbFromHexName(fromqstr(newColor.name()));
+	changed();
+}
+
+
+void GuiDocument::deleteBoxBackgroundColor()
+{
+	// set the button color back to pref
+	theApp()->getRgbColor(Color_shadedbg, set_boxbgcolor);
+	colorModule->boxBackgroundPB->setStyleSheet(
+		colorButtonStyleSheet(rgb2qcolor(set_boxbgcolor)));
+	changed();
+}
+
+
+void GuiDocument::osFontsChanged(bool nontexfonts)
+{
+	bool const tex_fonts = !nontexfonts;
 	updateFontlist();
 	updateDefaultFormat();
-	langModule->encodingCO->setEnabled(!xetex &&
+	langModule->encodingCO->setEnabled(tex_fonts &&
 		!langModule->defaultencodingRB->isChecked());
-	langModule->defaultencodingRB->setEnabled(!xetex);
-	langModule->otherencodingRB->setEnabled(!xetex);
+	langModule->defaultencodingRB->setEnabled(tex_fonts);
+	langModule->otherencodingRB->setEnabled(tex_fonts);
 
-	fontModule->fontsDefaultCO->setEnabled(!xetex);
-	fontModule->fontsDefaultLA->setEnabled(!xetex);
-	fontModule->cjkFontLE->setEnabled(!xetex);
-	fontModule->cjkFontLA->setEnabled(!xetex);
+	fontModule->fontsDefaultCO->setEnabled(tex_fonts);
+	fontModule->fontsDefaultLA->setEnabled(tex_fonts);
+	fontModule->cjkFontLE->setEnabled(tex_fonts);
+	fontModule->cjkFontLA->setEnabled(tex_fonts);
 	string font;
-	if (!xetex)
+	if (tex_fonts)
 		font = tex_fonts_sans[fontModule->fontsSansCO->currentIndex()];
 	bool scaleable = providesScale(font);
 	fontModule->scaleSansSB->setEnabled(scaleable);
 	fontModule->scaleSansLA->setEnabled(scaleable);
-	if (!xetex)
+	if (tex_fonts)
 		font = tex_fonts_monospaced[fontModule->fontsTypewriterCO->currentIndex()];
 	scaleable = providesScale(font);
 	fontModule->scaleTypewriterSB->setEnabled(scaleable);
 	fontModule->scaleTypewriterLA->setEnabled(scaleable);
-	if (!xetex)
+	if (tex_fonts)
 		font = tex_fonts_roman[fontModule->fontsRomanCO->currentIndex()];
 	fontModule->fontScCB->setEnabled(providesSC(font));
 	fontModule->fontOsfCB->setEnabled(providesOSF(font));
+	
+	fontModule->fontencLA->setEnabled(tex_fonts);
+	fontModule->fontencCO->setEnabled(tex_fonts);
+	if (!tex_fonts)
+		fontModule->fontencLE->setEnabled(false);
+	else
+		fontencChanged(fontModule->fontencCO->currentIndex());
 }
 
 
@@ -1291,17 +1745,17 @@ void GuiDocument::updateFontlist()
 	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"));
+	if (fontModule->osFontsCB->isChecked()) {
+		fontModule->fontsRomanCO->addItem(qt_("Default"), QString("default"));
+		fontModule->fontsSansCO->addItem(qt_("Default"), QString("default"));
+		fontModule->fontsTypewriterCO->addItem(qt_("Default"), QString("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);
+			fontModule->fontsRomanCO->addItem(*it, *it);
+			fontModule->fontsSansCO->addItem(*it, *it);
+			fontModule->fontsTypewriterCO->addItem(*it, *it);
 		}
 		return;
 	}
@@ -1310,26 +1764,32 @@ void GuiDocument::updateFontlist()
 		QString font = qt_(tex_fonts_roman_gui[n]);
 		if (!isFontAvailable(tex_fonts_roman[n]))
 			font += qt_(" (not installed)");
-		fontModule->fontsRomanCO->addItem(font);
+		fontModule->fontsRomanCO->addItem(font, qt_(tex_fonts_roman[n]));
 	}
 	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);
+		fontModule->fontsSansCO->addItem(font, qt_(tex_fonts_sans[n]));
 	}
 	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);
+		fontModule->fontsTypewriterCO->addItem(font, qt_(tex_fonts_monospaced[n]));
 	}
 }
 
 
+void GuiDocument::fontencChanged(int item)
+{
+	fontModule->fontencLE->setEnabled(item == 1);
+}
+
+
 void GuiDocument::romanChanged(int item)
 {
-	if (outputModule->xetexCB->isChecked())
+	if (fontModule->osFontsCB->isChecked())
 		return;
 	string const font = tex_fonts_roman[item];
 	fontModule->fontScCB->setEnabled(providesSC(font));
@@ -1339,7 +1799,7 @@ void GuiDocument::romanChanged(int item)
 
 void GuiDocument::sansChanged(int item)
 {
-	if (outputModule->xetexCB->isChecked())
+	if (fontModule->osFontsCB->isChecked())
 		return;
 	string const font = tex_fonts_sans[item];
 	bool scaleable = providesScale(font);
@@ -1350,7 +1810,7 @@ void GuiDocument::sansChanged(int item)
 
 void GuiDocument::ttChanged(int item)
 {
-	if (outputModule->xetexCB->isChecked())
+	if (fontModule->osFontsCB->isChecked())
 		return;
 	string const font = tex_fonts_monospaced[item];
 	bool scaleable = providesScale(font);
@@ -1393,7 +1853,7 @@ void GuiDocument::browseLayout()
 	QString const label1 = qt_("Layouts|#o#O");
 	QString const dir1 = toqstr(lyxrc.document_path);
 	QStringList const filter(qt_("LyX Layout (*.layout)"));
-	QString file = browseRelFile(QString(), bufferFilepath(),
+	QString file = browseRelToParent(QString(), bufferFilePath(),
 		qt_("Local layout file"), filter, false,
 		label1, dir1);
 
@@ -1401,7 +1861,7 @@ void GuiDocument::browseLayout()
 		return;
 
 	FileName layoutFile = support::makeAbsPath(fromqstr(file),
-		fromqstr(bufferFilepath()));
+		fromqstr(bufferFilePath()));
 	
 	int const ret = Alert::prompt(_("Local layout file"),
 		_("The layout file you have selected is a local layout\n"
@@ -1418,7 +1878,7 @@ void GuiDocument::browseLayout()
 	// this will update an existing layout if that layout has been loaded before.
 	LayoutFileIndex name = bcl.addLocalLayout(
 		classname.substr(0, classname.size() - 7),
-		layoutFile.onlyPath().absFilename());
+		layoutFile.onlyPath().absFileName());
 
 	if (name.empty()) {
 		Alert::error(_("Error"),
@@ -1449,10 +1909,11 @@ void GuiDocument::browseMaster()
 	QString const old = latexModule->childDocLE->text();
 	QString const docpath = toqstr(support::onlyPath(buffer().absFileName()));
 	QStringList const filter(qt_("LyX Files (*.lyx)"));
-	QString file = browseRelFile(old, docpath, title, filter, false,
+	QString file = browseRelToSub(old, docpath, title, filter, false,
 		qt_("Documents|#o#O"), toqstr(lyxrc.document_path));
 
-	latexModule->childDocLE->setText(file);
+	if (!file.isEmpty())
+		latexModule->childDocLE->setText(file);
 }
 
 
@@ -1512,14 +1973,25 @@ void GuiDocument::classChanged()
 }
 
 
+void GuiDocument::languagePackageChanged(int i)
+{
+	 langModule->languagePackageLE->setEnabled(
+		langModule->languagePackageCO->itemData(i).toString() == "custom");
+}
+
+
 void GuiDocument::bibtexChanged(int n)
 {
-	biblioModule->bibtexOptionsED->setEnabled(n != 0);
+	biblioModule->bibtexOptionsLE->setEnabled(
+		biblioModule->bibtexCO->itemData(n).toString() != "default");
 	changed();
 }
 
 
 namespace {
+	// FIXME unicode 
+	// both of these should take a vector<docstring>
+	
 	// This is an insanely complicated attempt to make this sort of thing
 	// work with RTL languages.
 	docstring formatStrVec(vector<string> const & v, docstring const & s) 
@@ -1528,22 +2000,24 @@ namespace {
 		if (v.size() == 0)
 			return docstring();
 		if (v.size() == 1) 
-			return from_utf8(v[0]);
+			return translateIfPossible(from_utf8(v[0]));
 		if (v.size() == 2) {
 			docstring retval = _("%1$s and %2$s");
 			retval = subst(retval, _("and"), s);
-			return bformat(retval, from_utf8(v[0]), from_utf8(v[1]));
+			return bformat(retval, translateIfPossible(from_utf8(v[0])),
+				       translateIfPossible(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_utf8(v[0]);
+		docstring retval = translateIfPossible(from_utf8(v[0]));
 		for (int i = 1; i < vSize - 2; ++i)
-			retval = bformat(t2, retval, from_utf8(v[i])); 
+			retval = bformat(t2, retval, translateIfPossible(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_utf8(v[vSize - 2]), from_utf8(v[vSize - 1]));
+		return bformat(t, retval, translateIfPossible(from_utf8(v[vSize - 2])),
+			       translateIfPossible(from_utf8(v[vSize - 1])));
 	}
 	
 	vector<string> idsToNames(vector<string> const & idList)
@@ -1552,15 +2026,16 @@ 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)");
+				retval.push_back(to_utf8(bformat(_("%1$s (unavailable)"), 
+						translateIfPossible(from_utf8(*it)))));
 			else
 				retval.push_back(mod->getName());
 		}
 		return retval;
 	}
-}
+} // end anonymous namespace
 
 
 void GuiDocument::modulesToParams(BufferParams & bp)
@@ -1609,8 +2084,11 @@ void GuiDocument::updateModuleInfo()
 	
 	//Module description
 	bool const focus_on_selected = selectionManager->selectedFocused();
-	QListView const * const lv = 
-			focus_on_selected ? modulesModule->selectedLV : modulesModule->availableLV;
+	QAbstractItemView * lv;
+	if (focus_on_selected)
+		lv = modulesModule->selectedLV;
+	else
+		lv= modulesModule->availableLV;
 	if (lv->selectionModel()->selectedIndexes().isEmpty()) {
 		modulesModule->infoML->document()->clear();
 		return;
@@ -1642,7 +2120,7 @@ void GuiDocument::updateModuleInfo()
 		pkgdesc = formatStrVec(reqdescs, _("or"));
 		if (!desc.empty())
 			desc += "\n";
-		desc += bformat(_("Module required: %1$s."), pkgdesc);
+		desc += bformat(_("Modules required: %1$s."), pkgdesc);
 	}
 
 	pkglist = getExcludedList(modName);
@@ -1696,21 +2174,23 @@ void GuiDocument::updateNumbering()
 
 void GuiDocument::updateDefaultFormat()
 {
+	if (!bufferview())
+		return;
 	// 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();
+	BufferParams param_copy = buffer().params();
+	param_copy.useNonTeXFonts = fontModule->osFontsCB->isChecked();
+	int const idx = latexModule->classCO->currentIndex();
 	if (idx >= 0) {
 		string const classname = classes_model_.getIDString(idx);
-		tmpbuf->params().setBaseClass(classname);
-		tmpbuf->params().makeDocumentClass();
+		param_copy.setBaseClass(classname);
+		param_copy.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 formats = param_copy.exportableFormats(true);
 	Formats::const_iterator cit = formats.begin();
 	Formats::const_iterator end = formats.end();
 	for (; cit != end; ++cit)
@@ -1720,10 +2200,24 @@ void GuiDocument::updateDefaultFormat()
 }
 
 
+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(bp_);
+	localLayout->apply(bp_);
+
+	// date
+	bp_.suppress_date = latexModule->suppressDateCB->isChecked();
+	bp_.use_refstyle  = latexModule->refstyleCB->isChecked();
 
 	// biblio
 	bp_.setCiteEngine(ENGINE_BASIC);
@@ -1746,7 +2240,7 @@ void GuiDocument::applyView()
 		fromqstr(biblioModule->bibtexCO->itemData(
 			biblioModule->bibtexCO->currentIndex()).toString());
 	string const bibtex_options =
-		fromqstr(biblioModule->bibtexOptionsED->text());
+		fromqstr(biblioModule->bibtexOptionsLE->text());
 	if (bibtex_command == "default" || bibtex_options.empty())
 		bp_.bibtex_command = bibtex_command;
 	else
@@ -1808,7 +2302,23 @@ void GuiDocument::applyView()
 
 	QString const lang = langModule->languageCO->itemData(
 		langModule->languageCO->currentIndex()).toString();
-	bp_.language = languages.getLanguage(fromqstr(lang));
+	bp_.language = lyx::languages.getLanguage(fromqstr(lang));
+	
+	QString const pack = langModule->languagePackageCO->itemData(
+		langModule->languagePackageCO->currentIndex()).toString();
+	if (pack == "custom")
+		bp_.lang_package =
+			fromqstr(langModule->languagePackageLE->text());
+	else
+		bp_.lang_package = fromqstr(pack);
+
+	//color
+	bp_.backgroundcolor = set_backgroundcolor;
+	bp_.isbackgroundcolor = is_backgroundcolor;
+	bp_.fontcolor = set_fontcolor;
+	bp_.isfontcolor = is_fontcolor;
+	bp_.notefontcolor = set_notefontcolor;
+	bp_.boxbgcolor = set_boxbgcolor;
 
 	// numbering
 	if (bp_.documentClass().hasTocLevels()) {
@@ -1823,7 +2333,7 @@ void GuiDocument::applyView()
 	bp_.user_defined_bullet(3) = bulletsModule->bullet(3);
 
 	// packages
-	bp_.graphicsDriver =
+	bp_.graphics_driver =
 		tex_graphics[latexModule->psdriverCO->currentIndex()];
 	
 	// text layout
@@ -1836,15 +2346,15 @@ void GuiDocument::applyView()
 	// Modules
 	modulesToParams(bp_);
 
-	if (mathsModule->amsautoCB->isChecked()) {
+	// Math
+	if (mathsModule->amsautoCB->isChecked())
 		bp_.use_amsmath = BufferParams::package_auto;
-	} else {
+	else {
 		if (mathsModule->amsCB->isChecked())
 			bp_.use_amsmath = BufferParams::package_on;
 		else
 			bp_.use_amsmath = BufferParams::package_off;
 	}
-
 	if (mathsModule->esintautoCB->isChecked())
 		bp_.use_esint = BufferParams::package_auto;
 	else {
@@ -1853,7 +2363,32 @@ void GuiDocument::applyView()
 		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
+			bp_.use_mhchem = BufferParams::package_off;
+	}
+	if (mathsModule->mathdotsautoCB->isChecked())
+		bp_.use_mathdots = BufferParams::package_auto;
+	else {
+		if (mathsModule->mathdotsCB->isChecked())
+			bp_.use_mathdots = BufferParams::package_on;
+		else
+			bp_.use_mathdots = BufferParams::package_off;
+	}
+	if (mathsModule->undertildeautoCB->isChecked())
+		bp_.use_undertilde = BufferParams::package_auto;
+	else {
+		if (mathsModule->undertildeCB->isChecked())
+			bp_.use_undertilde = BufferParams::package_on;
+		else
+			bp_.use_undertilde = BufferParams::package_off;
+	}
+	
+	// Page Layout
 	if (pageLayoutModule->pagestyleCO->currentIndex() == 0)
 		bp_.pagestyle = "default";
 	else {
@@ -1863,6 +2398,7 @@ void GuiDocument::applyView()
 				bp_.pagestyle = pagestyles[i].first;
 	}
 
+	// Text Layout
 	switch (textLayoutModule->lspacingCO->currentIndex()) {
 	case 0:
 		bp_.spacing().set(Spacing::Single);
@@ -1873,10 +2409,14 @@ void GuiDocument::applyView()
 	case 2:
 		bp_.spacing().set(Spacing::Double);
 		break;
-	case 3:
-		bp_.spacing().set(Spacing::Other,
-			fromqstr(textLayoutModule->lspacingLE->text()));
+	case 3: {
+		string s = widgetToDoubleStr(textLayoutModule->lspacingLE);
+		if (s.empty())
+			bp_.spacing().set(Spacing::Single);
+		else
+			bp_.spacing().set(Spacing::Other, s);
 		break;
+		}
 	}
 
 	if (textLayoutModule->twoColumnCB->isChecked())
@@ -1884,39 +2424,53 @@ void GuiDocument::applyView()
 	else
 		bp_.columns = 1;
 
-	// text should have passed validation
-	bp_.listings_params =
-		InsetListingsParams(fromqstr(textLayoutModule->listingsED->toPlainText())).params();
-
-	if (textLayoutModule->indentRB->isChecked())
+	if (textLayoutModule->indentRB->isChecked()) {
+		// if paragraphs are separated by an indentation
 		bp_.paragraph_separation = BufferParams::ParagraphIndentSeparation;
-	else
+		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,
+		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)
-			);
-		bp_.setDefSkip(vs);
-		break;
-	}
-	default:
-		// DocumentDefskipCB assures that this never happens
-		// so Assert then !!!  - jbl
-		bp_.setDefSkip(VSpace(VSpace::MEDSKIP));
-		break;
+				);
+			bp_.setDefSkip(vs);
+			break;
+			}
+		default:
+			// this should never happen
+			bp_.setDefSkip(VSpace(VSpace::MEDSKIP));
+			break;
+		}
 	}
 
 	bp_.options =
@@ -1931,60 +2485,79 @@ void GuiDocument::applyView()
 	else
 		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();
+
+	// Float Placement
 	bp_.float_placement = floatModule->get();
 
+	// Listings
+	// text should have passed validation
+	bp_.listings_params =
+		InsetListingsParams(fromqstr(listingsModule->listingsED->toPlainText())).params();
+
 	// output
-	bp_.defaultOutputFormat = fromqstr(outputModule->defaultFormatCO->itemData(
+	bp_.default_output_format = fromqstr(outputModule->defaultFormatCO->itemData(
 		outputModule->defaultFormatCO->currentIndex()).toString());
 
-	bool const xetex = outputModule->xetexCB->isChecked();
-	bp_.useXetex = xetex;
+	bool const nontexfonts = fontModule->osFontsCB->isChecked();
+	bp_.useNonTeXFonts = nontexfonts;
 
-	// 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()];
-	}
+	bp_.output_sync = outputModule->outputsyncCB->isChecked();
+	bp_.output_sync_macro = fromqstr(outputModule->synccustomCB->currentText());
 
-	bp_.fontsCJK =
+	int mathfmt = outputModule->mathoutCB->currentIndex();
+	if (mathfmt == -1)
+		mathfmt = 0;
+	BufferParams::MathOutput const mo =
+		static_cast<BufferParams::MathOutput>(mathfmt);
+	bp_.html_math_output = mo;
+	bp_.html_be_strict = outputModule->strictCB->isChecked();
+	bp_.html_math_img_scale = outputModule->mathimgSB->value();
+
+	// fonts
+	bp_.fonts_roman =
+		fromqstr(fontModule->fontsRomanCO->
+			itemData(fontModule->fontsRomanCO->currentIndex()).toString());
+
+	bp_.fonts_sans =
+		fromqstr(fontModule->fontsSansCO->
+			itemData(fontModule->fontsSansCO->currentIndex()).toString());
+
+	bp_.fonts_typewriter =
+		fromqstr(fontModule->fontsTypewriterCO->
+			itemData(fontModule->fontsTypewriterCO->currentIndex()).toString());
+
+	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";
+
+	bp_.fonts_cjk =
 		fromqstr(fontModule->cjkFontLE->text());
 
-	bp_.fontsSansScale = fontModule->scaleSansSB->value();
+	bp_.fonts_sans_scale = fontModule->scaleSansSB->value();
 
-	bp_.fontsTypewriterScale = fontModule->scaleTypewriterSB->value();
+	bp_.fonts_typewriter_scale = fontModule->scaleTypewriterSB->value();
 
-	bp_.fontsSC = fontModule->fontScCB->isChecked();
+	bp_.fonts_expert_sc = fontModule->fontScCB->isChecked();
 
-	bp_.fontsOSF = fontModule->fontOsfCB->isChecked();
+	bp_.fonts_old_figures = fontModule->fontOsfCB->isChecked();
 
-	if (xetex)
-		bp_.fontsDefaultFamily = "default";
+	if (nontexfonts)
+		bp_.fonts_default_family = "default";
 	else
-		bp_.fontsDefaultFamily = GuiDocument::fontfamilies[
+		bp_.fonts_default_family = GuiDocument::fontfamilies[
 			fontModule->fontsDefaultCO->currentIndex()];
 
 	if (fontModule->fontsizeCO->currentIndex() == 0)
@@ -1997,10 +2570,6 @@ void GuiDocument::applyView()
 	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);
-
 	bp_.paperwidth = widgetsToLength(pageLayoutModule->paperwidthLE,
 		pageLayoutModule->paperwidthUnitCO);
 
@@ -2017,11 +2586,8 @@ void GuiDocument::applyView()
 	else
 		bp_.orientation = ORIENTATION_PORTRAIT;
 
-	bp_.backgroundcolor = set_backgroundcolor;
-
 	// margins
-	bp_.use_geometry = !marginsModule->marginCB->isChecked()
-		|| geom_papersize;
+	bp_.use_geometry = !marginsModule->marginCB->isChecked();
 
 	Ui::MarginsUi const * m = marginsModule;
 
@@ -2034,6 +2600,7 @@ void GuiDocument::applyView()
 	bp_.footskip = widgetsToLength(m->footskipLE, m->footskipUnit);
 	bp_.columnsep = widgetsToLength(m->columnsepLE, m->columnsepUnit);
 
+	// branches
 	branchesModule->apply(bp_);
 
 	// PDF support
@@ -2071,6 +2638,11 @@ void GuiDocument::paramsToDialog()
 
 	// preamble
 	preambleModule->update(bp_, id());
+	localLayout->update(bp_, id());
+
+	// date
+	latexModule->suppressDateCB->setChecked(bp_.suppress_date);
+	latexModule->refstyleCB->setChecked(bp_.use_refstyle);
 
 	// biblio
 	biblioModule->citeDefaultRB->setChecked(
@@ -2096,12 +2668,15 @@ void GuiDocument::paramsToDialog()
 	int const bpos = biblioModule->bibtexCO->findData(toqstr(command));
 	if (bpos != -1) {
 		biblioModule->bibtexCO->setCurrentIndex(bpos);
-		biblioModule->bibtexOptionsED->setText(toqstr(options).trimmed());
+		biblioModule->bibtexOptionsLE->setText(toqstr(options).trimmed());
 	} else {
-		biblioModule->bibtexCO->setCurrentIndex(0);
-		biblioModule->bibtexOptionsED->clear();
+		// We reset to default if we do not know the specified compiler
+		// This is for security reasons
+		biblioModule->bibtexCO->setCurrentIndex(
+			biblioModule->bibtexCO->findData(toqstr("default")));
+		biblioModule->bibtexOptionsLE->clear();
 	}
-	biblioModule->bibtexOptionsED->setEnabled(
+	biblioModule->bibtexOptionsLE->setEnabled(
 		biblioModule->bibtexCO->currentIndex() != 0);
 
 	// indices
@@ -2142,6 +2717,39 @@ void GuiDocument::paramsToDialog()
 	langModule->defaultencodingRB->setChecked(default_enc);
 	langModule->otherencodingRB->setChecked(!default_enc);
 
+	int const p = langModule->languagePackageCO->findData(toqstr(bp_.lang_package));
+	if (p == -1) {
+		langModule->languagePackageCO->setCurrentIndex(
+			  langModule->languagePackageCO->findData("custom"));
+		langModule->languagePackageLE->setText(toqstr(bp_.lang_package));
+	} else {
+		langModule->languagePackageCO->setCurrentIndex(p);
+		langModule->languagePackageLE->clear();
+	}
+
+	//color
+	if (bp_.isfontcolor) {
+		colorModule->fontColorPB->setStyleSheet(
+			colorButtonStyleSheet(rgb2qcolor(bp_.fontcolor)));
+	}
+	set_fontcolor = bp_.fontcolor;
+	is_fontcolor = bp_.isfontcolor;
+
+	colorModule->noteFontColorPB->setStyleSheet(
+		colorButtonStyleSheet(rgb2qcolor(bp_.notefontcolor)));
+	set_notefontcolor = bp_.notefontcolor;
+
+	if (bp_.isbackgroundcolor) {
+		colorModule->backgroundPB->setStyleSheet(
+			colorButtonStyleSheet(rgb2qcolor(bp_.backgroundcolor)));
+	}
+	set_backgroundcolor = bp_.backgroundcolor;
+	is_backgroundcolor = bp_.isbackgroundcolor;
+
+	colorModule->boxBackgroundPB->setStyleSheet(
+		colorButtonStyleSheet(rgb2qcolor(bp_.boxbgcolor)));
+	set_boxbgcolor = bp_.boxbgcolor;
+
 	// numbering
 	int const min_toclevel = documentClass().min_toclevel();
 	int const max_toclevel = documentClass().max_toclevel();
@@ -2167,7 +2775,7 @@ void GuiDocument::paramsToDialog()
 	bulletsModule->init();
 
 	// packages
-	int nitem = findToken(tex_graphics, bp_.graphicsDriver);
+	int nitem = findToken(tex_graphics, bp_.graphics_driver);
 	if (nitem >= 0)
 		latexModule->psdriverCO->setCurrentIndex(nitem);
 	updateModuleInfo();
@@ -2182,6 +2790,21 @@ 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);
+
+	mathsModule->mathdotsCB->setChecked(
+		bp_.use_mathdots == BufferParams::package_on);
+	mathsModule->mathdotsautoCB->setChecked(
+		bp_.use_mathdots == BufferParams::package_auto);
+
+	mathsModule->undertildeCB->setChecked(
+		bp_.use_undertilde == BufferParams::package_on);
+	mathsModule->undertildeautoCB->setChecked(
+		bp_.use_undertilde == BufferParams::package_auto);
+
 	switch (bp_.spacing().getSpace()) {
 		case Spacing::Other: nitem = 3; break;
 		case Spacing::Double: nitem = 2; break;
@@ -2198,51 +2821,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));
@@ -2283,87 +2911,127 @@ void GuiDocument::paramsToDialog()
 		latexModule->childDocGB->setChecked(false);
 	}
 
+	// Master/Child
+	if (!bufferview() || !buffer().hasChildren()) {
+		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));
+		bp_.default_output_format));
 	// 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);
+	bool const os_fonts_available =
+		bp_.baseClass()->outputType() == lyx::LATEX
+		&& LaTeXFeatures::isAvailable("fontspec");
+	fontModule->osFontsCB->setEnabled(os_fonts_available);
+	fontModule->osFontsCB->setChecked(
+		os_fonts_available && bp_.useNonTeXFonts);
+
+	outputModule->outputsyncCB->setChecked(bp_.output_sync);
+	outputModule->synccustomCB->setEditText(toqstr(bp_.output_sync_macro));
+
+	outputModule->mathimgSB->setValue(bp_.html_math_img_scale);
+	outputModule->mathoutCB->setCurrentIndex(bp_.html_math_output);
+	outputModule->strictCB->setChecked(bp_.html_be_strict);
 
 	// Fonts
 	updateFontsize(documentClass().opt_fontsize(),
 			bp_.fontsize);
 
-	if (bp_.useXetex) {
-		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;
-			}
-		}
+	QString font = toqstr(bp_.fonts_roman);
+	int rpos = fontModule->fontsRomanCO->findData(font);
+	if (rpos == -1) {
+		rpos = fontModule->fontsRomanCO->count();
+		fontModule->fontsRomanCO->addItem(font + qt_(" (not installed)"), font);
+	}
+	fontModule->fontsRomanCO->setCurrentIndex(rpos);
+
+	font = toqstr(bp_.fonts_sans);
+	int spos = fontModule->fontsSansCO->findData(font);
+	if (spos == -1) {
+		spos = fontModule->fontsSansCO->count();
+		fontModule->fontsSansCO->addItem(font + qt_(" (not installed)"), font);
+	}
+	fontModule->fontsSansCO->setCurrentIndex(spos);
+
+	font = toqstr(bp_.fonts_typewriter);
+	int tpos = fontModule->fontsTypewriterCO->findData(font);
+	if (tpos == -1) {
+		tpos = fontModule->fontsTypewriterCO->count();
+		fontModule->fontsTypewriterCO->addItem(font + qt_(" (not installed)"), font);
+	}
+	fontModule->fontsTypewriterCO->setCurrentIndex(tpos);
+
+	if (bp_.useNonTeXFonts && os_fonts_available) {
+		fontModule->fontencLA->setEnabled(false);
+		fontModule->fontencCO->setEnabled(false);
+		fontModule->fontencLE->setEnabled(false);
 	} else {
-		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);
-		}
+		fontModule->fontencLA->setEnabled(true);
+		fontModule->fontencCO->setEnabled(true);
+		fontModule->fontencLE->setEnabled(true);
+		romanChanged(rpos);
+		sansChanged(spos);
+		ttChanged(tpos);
 	}
 
-	if (!bp_.fontsCJK.empty())
+	if (!bp_.fonts_cjk.empty())
 		fontModule->cjkFontLE->setText(
-			toqstr(bp_.fontsCJK));
+			toqstr(bp_.fonts_cjk));
 	else
 		fontModule->cjkFontLE->setText(QString());
 
-	fontModule->fontScCB->setChecked(bp_.fontsSC);
-	fontModule->fontOsfCB->setChecked(bp_.fontsOSF);
-	fontModule->scaleSansSB->setValue(bp_.fontsSansScale);
-	fontModule->scaleTypewriterSB->setValue(bp_.fontsTypewriterScale);
-
-	int nn = findToken(GuiDocument::fontfamilies, bp_.fontsDefaultFamily);
+	fontModule->fontScCB->setChecked(bp_.fonts_expert_sc);
+	fontModule->fontOsfCB->setChecked(bp_.fonts_old_figures);
+	fontModule->scaleSansSB->setValue(bp_.fonts_sans_scale);
+	fontModule->scaleTypewriterSB->setValue(bp_.fonts_typewriter_scale);
+	
+	int nn = findToken(GuiDocument::fontfamilies, bp_.fonts_default_family);
 	if (nn >= 0)
 		fontModule->fontsDefaultCO->setCurrentIndex(nn);
 
+	if (bp_.fontenc == "global") {
+		fontModule->fontencCO->setCurrentIndex(0);
+		fontModule->fontencLE->setEnabled(false);
+	} else if (bp_.fontenc == "default") {
+		fontModule->fontencCO->setCurrentIndex(2);
+		fontModule->fontencLE->setEnabled(false);
+	} 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(!extern_geometry && psize);
+	setCustomPapersize(!extern_geometry && psize == 1);
 	pageLayoutModule->papersizeCO->setEnabled(!extern_geometry);
 
 	bool const landscape =
@@ -2376,10 +3044,6 @@ void GuiDocument::paramsToDialog()
 	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,
@@ -2388,7 +3052,7 @@ void GuiDocument::paramsToDialog()
 	// margins
 	Ui::MarginsUi * m = marginsModule;
 
-	setMargins(!bp_.use_geometry);
+	setMargins();
 
 	lengthToWidgets(m->topLE, m->topUnit,
 		bp_.topmargin, defaultUnit);
@@ -2450,6 +3114,9 @@ void GuiDocument::paramsToDialog()
 	// Make sure that the bc is in the INITIAL state
 	if (bc().policy().buttonStatus(ButtonPolicy::RESTORE))
 		bc().restore();
+
+	// clear changed branches cache
+	changedBranches_.clear();
 }
 
 
@@ -2485,6 +3152,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;
+	ListOfBuffers children = buffer().getChildren();
+	ListOfBuffers::const_iterator it  = children.begin();
+	ListOfBuffers::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.
@@ -2527,9 +3242,25 @@ void GuiDocument::setLayoutComboByIDString(string const & idString)
 
 bool GuiDocument::isValid()
 {
-	return validateListingsParameters().isEmpty()
-		&& (textLayoutModule->skipCO->currentIndex() != 3
-			|| !textLayoutModule->skipLE->text().isEmpty());
+	return 
+		validateListingsParameters().isEmpty() &&
+		localLayout->isValid() &&
+		(
+			// if we're asking for skips between paragraphs
+			!textLayoutModule->skipRB->isChecked() ||
+			// then either we haven't chosen custom
+			textLayoutModule->skipCO->currentIndex() != 3 || 
+			// or else a length has been given
+			!textLayoutModule->skipLE->text().isEmpty()
+		) && 
+		(
+			// if we're asking for indentation
+			!textLayoutModule->indentRB->isChecked() || 
+			// then either we haven't chosen custom
+			textLayoutModule->indentCO->currentIndex() != 1 || 
+			// or else a length has been given
+			!textLayoutModule->indentLE->text().isEmpty()
+		);
 }
 
 
@@ -2591,7 +3322,7 @@ list<GuiDocument::modInfoStruct> const
 	for (; it != end; ++it) {
 		modInfoStruct m;
 		m.id = *it;
-		LyXModule * mod = moduleList[*it];
+		LyXModule const * const mod = theModuleList[*it];
 		if (mod)
 			// FIXME Unicode
 			m.name = toqstr(translateIfPossible(from_utf8(mod->getName())));
@@ -2644,7 +3375,7 @@ void GuiDocument::dispatchParams()
 	if (!params().master.empty()) {
 		FileName const master_file = support::makeAbsPath(params().master,
 			   support::onlyPath(buffer().absFileName()));
-		if (isLyXFilename(master_file.absFilename())) {
+		if (isLyXFileName(master_file.absFileName())) {
 			Buffer * master = checkAndLoadLyXFile(master_file);
 			if (master) {
 				if (master->isChild(const_cast<Buffer *>(&buffer())))
@@ -2677,24 +3408,30 @@ void GuiDocument::dispatchParams()
 		}
 
 		// Open insets of selected branches, close deselected ones
-		dispatch(FuncRequest(LFUN_ALL_INSETS_TOGGLE,
-			"assign branch"));
+		dispatch(FuncRequest(LFUN_INSET_FORALL,
+			"Branch inset-toggle assign"));
 	}
+	// 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->index();
-			Index const * index = indiceslist.find(current_index);
+			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:
+	// FIXME LFUN
+	// If we used an LFUN, we would not need these two lines:
 	BufferView * bv = const_cast<BufferView *>(bufferview());
 	bv->processUpdateFlags(Update::Force | Update::FitCursor);
 }
@@ -2742,7 +3479,7 @@ bool GuiDocument::isFontAvailable(string const & font) const
 
 bool GuiDocument::providesOSF(string const & font) const
 {
-	if (outputModule->xetexCB->isChecked())
+	if (fontModule->osFontsCB->isChecked())
 		// FIXME: we should check if the fonts really
 		// have OSF support. But how?
 		return true;
@@ -2756,7 +3493,7 @@ bool GuiDocument::providesOSF(string const & font) const
 
 bool GuiDocument::providesSC(string const & font) const
 {
-	if (outputModule->xetexCB->isChecked())
+	if (fontModule->osFontsCB->isChecked())
 		return false;
 	if (font == "palatino")
 		return isFontAvailable("mathpazo");
@@ -2768,7 +3505,7 @@ bool GuiDocument::providesSC(string const & font) const
 
 bool GuiDocument::providesScale(string const & font) const
 {
-	if (outputModule->xetexCB->isChecked())
+	if (fontModule->osFontsCB->isChecked())
 		return true;
 	return font == "helvet" || font == "luximono"
 		|| font == "berasans"  || font == "beramono";
@@ -2778,8 +3515,8 @@ 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();
@@ -2800,11 +3537,13 @@ void GuiDocument::loadModuleInfo()
 
 void GuiDocument::updateUnknownBranches()
 {
+	if (!bufferview())
+		return;
 	list<docstring> used_branches;
 	buffer().getUsedBranches(used_branches);
 	list<docstring>::const_iterator it = used_branches.begin();
 	QStringList unknown_branches;
-	for (it ; it != used_branches.end() ; ++it) {
+	for (; it != used_branches.end() ; ++it) {
 		if (!buffer().params().branchlist().find(*it))
 			unknown_branches.append(toqstr(*it));
 	}
@@ -2812,6 +3551,31 @@ void GuiDocument::updateUnknownBranches()
 }
 
 
+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); }