]> git.lyx.org Git - lyx.git/blobdiff - src/frontends/qt4/GuiDocument.cpp
* fix spelling in comments to please John.
[lyx.git] / src / frontends / qt4 / GuiDocument.cpp
index c1be148ac15612f71d45e1d6e0ab3cb96fc6b857..71eff5b92c4de5481598a5698cfeff0c97e8e8c4 100644 (file)
@@ -15,6 +15,7 @@
 
 #include "GuiApplication.h"
 #include "GuiBranches.h"
+#include "GuiIndices.h"
 #include "GuiSelectionManager.h"
 #include "LaTeXHighlighter.h"
 #include "LengthCombo.h"
 #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 "frontends/alert.h"
 
 #include <QAbstractItemModel>
+#include <QHeaderView>
+#include <QColor>
+#include <QColorDialog>
 #include <QCloseEvent>
+#include <QFontDatabase>
 #include <QScrollBar>
 #include <QTextCursor>
 
 #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;
 
@@ -155,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
@@ -168,10 +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() &&
-                        translateIfPossible(from_utf8(tc1.description()))
-                        < translateIfPossible(from_utf8(tc2.description())));
+                       (tc1.isTeXClassAvailable() == tc2.isTeXClassAvailable() && order < 0);
        }
 };
 
@@ -182,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();
@@ -191,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();
@@ -200,7 +225,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
@@ -210,7 +235,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();
@@ -219,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();
@@ -240,7 +265,7 @@ class ModuleSelectionManager : public GuiSelectionManager
 public:
        ///
        ModuleSelectionManager(
-               QListView * availableLV, 
+               QTreeView * availableLV,
                QListView * selectedLV,
                QPushButton * addPB, 
                QPushButton * delPB, 
@@ -278,9 +303,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_;
 };
@@ -409,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;
+               // 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);
 }
 
@@ -530,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(
@@ -577,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)),
@@ -597,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 &)),
@@ -610,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]));
@@ -642,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)),
@@ -665,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"));
@@ -839,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>;
@@ -850,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()));
@@ -859,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
@@ -882,6 +970,8 @@ 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()));
 
        // postscript drivers
        for (int n = 0; tex_graphics[n][0]; ++n) {
@@ -908,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;
@@ -921,7 +1014,7 @@ GuiDocument::GuiDocument(GuiView & lv)
 
        // Modules
        modulesModule = new UiWidget<Ui::ModulesUi>;
-
+       modulesModule->availableLV->header()->setVisible(false);
        selectionManager =
                new ModuleSelectionManager(modulesModule->availableLV,
                        modulesModule->selectedLV,
@@ -979,7 +1072,21 @@ 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"));
@@ -988,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
@@ -1027,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
@@ -1034,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());
@@ -1055,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);
        }
 }
 
@@ -1072,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);
@@ -1158,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)
 {
@@ -1177,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));
@@ -1187,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);
@@ -1196,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);
@@ -1296,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);
 }
 
 
@@ -1356,6 +1636,13 @@ void GuiDocument::classChanged()
 }
 
 
+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.
@@ -1389,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
@@ -1446,8 +1733,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;
@@ -1531,11 +1821,49 @@ void GuiDocument::updateNumbering()
 }
 
 
+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(bp_);
 
+       // date
+       bp_.suppress_date = latexModule->suppressDateCB->isChecked();
+
        // biblio
        bp_.setCiteEngine(ENGINE_BASIC);
 
@@ -1553,6 +1881,19 @@ void GuiDocument::applyView()
        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()) {
                bp_.inputenc = "auto";
@@ -1634,6 +1975,7 @@ void GuiDocument::applyView()
        // Modules
        modulesToParams(bp_);
 
+       // Math
        if (mathsModule->amsautoCB->isChecked()) {
                bp_.use_amsmath = BufferParams::package_auto;
        } else {
@@ -1642,7 +1984,6 @@ void GuiDocument::applyView()
                else
                        bp_.use_amsmath = BufferParams::package_off;
        }
-
        if (mathsModule->esintautoCB->isChecked())
                bp_.use_esint = BufferParams::package_auto;
        else {
@@ -1651,7 +1992,16 @@ 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;
+       }
 
+       // Page Layout
        if (pageLayoutModule->pagestyleCO->currentIndex() == 0)
                bp_.pagestyle = "default";
        else {
@@ -1661,6 +2011,7 @@ void GuiDocument::applyView()
                                bp_.pagestyle = pagestyles[i].first;
        }
 
+       // Text Layout
        switch (textLayoutModule->lspacingCO->currentIndex()) {
        case 0:
                bp_.spacing().set(Spacing::Single);
@@ -1673,7 +2024,7 @@ void GuiDocument::applyView()
                break;
        case 3:
                bp_.spacing().set(Spacing::Other,
-                       fromqstr(textLayoutModule->lspacingLE->text()));
+                       widgetToDoubleStr(textLayoutModule->lspacingLE));
                break;
        }
 
@@ -1682,39 +2033,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 =
@@ -1729,17 +2094,68 @@ 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();
 
-       // fonts
-       bp_.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());
 
-       bp_.fontsSans =
-               tex_fonts_sans[fontModule->fontsSansCO->currentIndex()];
+       bool const xetex = outputModule->xetexCB->isChecked();
+       bp_.useXetex = xetex;
+
+       // 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_.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";
 
        bp_.fontsCJK =
                fromqstr(fontModule->cjkFontLE->text());
@@ -1752,8 +2168,11 @@ void GuiDocument::applyView()
 
        bp_.fontsOSF = fontModule->fontOsfCB->isChecked();
 
-       bp_.fontsDefaultFamily = GuiDocument::fontfamilies[
-               fontModule->fontsDefaultCO->currentIndex()];
+       if (xetex)
+               bp_.fontsDefaultFamily = "default";
+       else
+               bp_.fontsDefaultFamily = GuiDocument::fontfamilies[
+                       fontModule->fontsDefaultCO->currentIndex()];
 
        if (fontModule->fontsizeCO->currentIndex() == 0)
                bp_.fontsize = "default";
@@ -1785,6 +2204,8 @@ void GuiDocument::applyView()
        else
                bp_.orientation = ORIENTATION_PORTRAIT;
 
+       bp_.backgroundcolor = set_backgroundcolor;
+
        // margins
        bp_.use_geometry = !marginsModule->marginCB->isChecked()
                || geom_papersize;
@@ -1800,6 +2221,7 @@ void GuiDocument::applyView()
        bp_.footskip = widgetsToLength(m->footskipLE, m->footskipUnit);
        bp_.columnsep = widgetsToLength(m->columnsepLE, m->columnsepUnit);
 
+       // branches
        branchesModule->apply(bp_);
 
        // PDF support
@@ -1838,6 +2260,9 @@ void GuiDocument::paramsToDialog()
        // preamble
        preambleModule->update(bp_, id());
 
+       // date
+       latexModule->suppressDateCB->setChecked(bp_.suppress_date);
+
        // biblio
        biblioModule->citeDefaultRB->setChecked(
                bp_.citeEngine() == ENGINE_BASIC);
@@ -1855,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()));
@@ -1930,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;
@@ -1946,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));
@@ -2031,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())
@@ -2065,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);
 
@@ -2118,6 +2654,8 @@ void GuiDocument::paramsToDialog()
        lengthToWidgets(m->columnsepLE, m->columnsepUnit,
                bp_.columnsep, defaultUnit);
 
+       // branches
+       updateUnknownBranches();
        branchesModule->update(bp_);
 
        // PDF support
@@ -2139,9 +2677,9 @@ 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);
@@ -2152,6 +2690,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();
 }
 
 
@@ -2187,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.
@@ -2231,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());
 }
 
 
@@ -2293,7 +2886,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())));
@@ -2382,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);
@@ -2430,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")
@@ -2440,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")
@@ -2450,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";
 }
@@ -2458,8 +3078,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();
@@ -2478,6 +3098,45 @@ 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); }