]> git.lyx.org Git - lyx.git/blobdiff - src/frontends/qt4/GuiDocument.cpp
On Linux show in crash message box the backtrace
[lyx.git] / src / frontends / qt4 / GuiDocument.cpp
index 5ddeb84f125557da88c00e022b30b50c2c3b7197..732c8430c85e2732b7d980f6de8343830e6219f1 100644 (file)
@@ -13,6 +13,7 @@
 
 #include "GuiDocument.h"
 
+#include "CategorizedCombo.h"
 #include "GuiApplication.h"
 #include "GuiBranches.h"
 #include "GuiIndices.h"
@@ -38,7 +39,9 @@
 #include "IndicesList.h"
 #include "Language.h"
 #include "LaTeXFeatures.h"
+#include "LaTeXFonts.h"
 #include "Layout.h"
+#include "LayoutEnums.h"
 #include "LayoutModuleList.h"
 #include "LyXRC.h"
 #include "ModuleList.h"
@@ -47,6 +50,7 @@
 #include "qt_helpers.h"
 #include "Spacing.h"
 #include "TextClass.h"
+#include "Undo.h"
 
 #include "insets/InsetListingsParams.h"
 
@@ -54,6 +58,7 @@
 #include "support/FileName.h"
 #include "support/filetools.h"
 #include "support/gettext.h"
+#include "support/lassert.h"
 #include "support/lstrings.h"
 
 #include "frontends/alert.h"
@@ -114,51 +119,6 @@ char const * const tex_graphics_gui[] =
 };
 
 
-char const * const tex_fonts_roman[] =
-{
-       "default", "cmr", "lmodern", "ae", "times", "palatino",
-       "charter", "newcent", "bookman", "utopia", "beraserif",
-       "ccfonts", "chancery", ""
-};
-
-
-char const * tex_fonts_roman_gui[] =
-{
-       N_("Default"), N_("Computer Modern Roman"), N_("Latin Modern Roman"),
-       N_("AE (Almost European)"), N_("Times Roman"), N_("Palatino"),
-       N_("Bitstream Charter"), N_("New Century Schoolbook"), N_("Bookman"),
-       N_("Utopia"),  N_("Bera Serif"), N_("Concrete Roman"), N_("Zapf Chancery"),
-       ""
-};
-
-
-char const * const tex_fonts_sans[] =
-{
-       "default", "cmss", "lmss", "helvet", "avant", "berasans", "cmbr", ""
-};
-
-
-char const * tex_fonts_sans_gui[] =
-{
-       N_("Default"), N_("Computer Modern Sans"), N_("Latin Modern Sans"),
-       N_("Helvetica"), N_("Avant Garde"), N_("Bera Sans"), N_("CM Bright"), ""
-};
-
-
-char const * const tex_fonts_monospaced[] =
-{
-       "default", "cmtt", "lmtt", "courier", "beramono", "luximono", "cmtl", ""
-};
-
-
-char const * tex_fonts_monospaced_gui[] =
-{
-       N_("Default"), N_("Computer Modern Typewriter"),
-       N_("Latin Modern Typewriter"), N_("Courier"), N_("Bera Mono"),
-       N_("LuxiMono"), N_("CM Typewriter Light"), ""
-};
-
-
 char const * backref_opts[] =
 {
        "false", "section", "slide", "page", ""
@@ -171,8 +131,14 @@ char const * backref_opts_gui[] =
 };
 
 
+vector<string> engine_types_;
 vector<pair<string, QString> > pagestyles;
 
+QMap<QString, QString> rmfonts_;
+QMap<QString, QString> sffonts_;
+QMap<QString, QString> ttfonts_;
+QMap<QString, QString> mathfonts_;
+
 
 } // anonymous namespace
 
@@ -184,6 +150,7 @@ RGBColor set_fontcolor;
 bool is_fontcolor;
 RGBColor set_notefontcolor;
 RGBColor set_boxbgcolor;
+bool forced_fontspec_activation;
 
 namespace {
 // used when sorting the textclass list.
@@ -211,7 +178,7 @@ public:
 namespace frontend {
 namespace {
 
-vector<string> getRequiredList(string const & modName) 
+vector<string> getRequiredList(string const & modName)
 {
        LyXModule const * const mod = theModuleList[modName];
        if (!mod)
@@ -229,6 +196,15 @@ vector<string> getExcludedList(string const & modName)
 }
 
 
+docstring getModuleCategory(string const & modName)
+{
+       LyXModule const * const mod = theModuleList[modName];
+       if (!mod)
+               return docstring();
+       return from_utf8(mod->category());
+}
+
+
 docstring getModuleDescription(string const & modName)
 {
        LyXModule const * const mod = theModuleList[modName];
@@ -266,16 +242,16 @@ bool isModuleAvailable(string const & modName)
 /////////////////////////////////////////////////////////////////////
 
 /// SelectionManager for use with modules
-class ModuleSelectionManager : public GuiSelectionManager 
+class ModuleSelectionManager : public GuiSelectionManager
 {
 public:
        ///
        ModuleSelectionManager(
                QTreeView * availableLV,
                QListView * selectedLV,
-               QPushButton * addPB, 
-               QPushButton * delPB, 
-               QPushButton * upPB, 
+               QPushButton * addPB,
+               QPushButton * delPB,
+               QPushButton * upPB,
                QPushButton * downPB,
                GuiIdListModel * availableModel,
                GuiIdListModel * selectedModel,
@@ -284,10 +260,10 @@ public:
                                upPB, downPB, availableModel, selectedModel), container_(container)
                {}
        ///
-       void updateProvidedModules(LayoutModuleList const & pm) 
+       void updateProvidedModules(LayoutModuleList const & pm)
                        { provided_modules_ = pm.list(); }
        ///
-       void updateExcludedModules(LayoutModuleList const & em) 
+       void updateExcludedModules(LayoutModuleList const & em)
                        { excluded_modules_ = em.list(); }
 private:
        ///
@@ -299,12 +275,12 @@ private:
        ///
        virtual void updateDelPB();
        /// returns availableModel as a GuiIdListModel
-       GuiIdListModel * getAvailableModel() 
+       GuiIdListModel * getAvailableModel()
        {
                return dynamic_cast<GuiIdListModel *>(availableModel);
        }
        /// returns selectedModel as a GuiIdListModel
-       GuiIdListModel * getSelectedModel() 
+       GuiIdListModel * getSelectedModel()
        {
                return dynamic_cast<GuiIdListModel *>(selectedModel);
        }
@@ -312,14 +288,14 @@ private:
        list<string> provided_modules_;
        /// similarly...
        list<string> excluded_modules_;
-       /// 
+       ///
        GuiDocument const * container_;
 };
 
-void ModuleSelectionManager::updateAddPB() 
+void ModuleSelectionManager::updateAddPB()
 {
        int const arows = availableModel->rowCount();
-       QModelIndexList const avail_sels = 
+       QModelIndexList const avail_sels =
                        availableLV->selectionModel()->selectedIndexes();
 
        // disable if there aren't any modules (?), if none of them is chosen
@@ -332,8 +308,8 @@ void ModuleSelectionManager::updateAddPB()
        QModelIndex const & idx = availableLV->selectionModel()->currentIndex();
        string const modname = getAvailableModel()->getIDString(idx.row());
 
-       bool const enable = 
-               container_->params().moduleCanBeAdded(modname);
+       bool const enable =
+               container_->params().layoutModuleCanBeAdded(modname);
        addPB->setEnabled(enable);
 }
 
@@ -365,13 +341,13 @@ void ModuleSelectionManager::updateDownPB()
        }
 
        // Enable it if this module isn't required.
-       // FIXME This should perhaps be more flexible and check whether, even 
+       // FIXME This should perhaps be more flexible and check whether, even
        // if the next one is required, there is also an earlier one that will do.
        downPB->setEnabled(
                        find(reqs.begin(), reqs.end(), curmodname) == reqs.end());
 }
 
-void ModuleSelectionManager::updateUpPB() 
+void ModuleSelectionManager::updateUpPB()
 {
        int const srows = selectedModel->rowCount();
        if (srows == 0) {
@@ -398,13 +374,13 @@ void ModuleSelectionManager::updateUpPB()
 
 
        // Enable it if the preceding module isn't required.
-       // NOTE This is less flexible than it might be. We could check whether, even 
+       // NOTE This is less flexible than it might be. We could check whether, even
        // if the previous one is required, there is an earlier one that would do.
        string const premod = getSelectedModel()->getIDString(curRow - 1);
        upPB->setEnabled(find(reqs.begin(), reqs.end(), premod) == reqs.end());
 }
 
-void ModuleSelectionManager::updateDelPB() 
+void ModuleSelectionManager::updateDelPB()
 {
        int const srows = selectedModel->rowCount();
        if (srows == 0) {
@@ -412,7 +388,7 @@ void ModuleSelectionManager::updateDelPB()
                return;
        }
 
-       QModelIndex const & curidx = 
+       QModelIndex const & curidx =
                selectedLV->selectionModel()->currentIndex();
        int const curRow = curidx.row();
        if (curRow < 0 || curRow >= srows) { // invalid index?
@@ -445,7 +421,7 @@ void ModuleSelectionManager::updateDelPB()
                for (int j = 0; j < curRow; ++j) {
                        string const mod = getSelectedModel()->getIDString(j);
                        // lyxerr << "In loop: Testing " << mod << endl;
-                       // do we satisfy the require? 
+                       // do we satisfy the require?
                        if (find(reqs.begin(), reqs.end(), mod) != reqs.end()) {
                                // lyxerr << mod << " does the trick." << endl;
                                foundone = true;
@@ -533,7 +509,7 @@ void PreambleModule::closeEvent(QCloseEvent * e)
 /////////////////////////////////////////////////////////////////////
 
 
-LocalLayout::LocalLayout() : current_id_(0), is_valid_(false)
+LocalLayout::LocalLayout() : current_id_(0), validated_(false)
 {
        connect(locallayoutTE, SIGNAL(textChanged()), this, SLOT(textChanged()));
        connect(validatePB, SIGNAL(clicked()), this, SLOT(validatePressed()));
@@ -543,7 +519,7 @@ LocalLayout::LocalLayout() : current_id_(0), is_valid_(false)
 
 void LocalLayout::update(BufferParams const & params, BufferId id)
 {
-       QString layout = toqstr(params.local_layout);
+       QString layout = toqstr(params.getLocalLayout(false));
        // Nothing to do if the params and preamble are unchanged.
        if (id == current_id_
                && layout == locallayoutTE->document()->toPlainText())
@@ -559,19 +535,32 @@ void LocalLayout::update(BufferParams const & params, BufferId id)
 void LocalLayout::apply(BufferParams & params)
 {
        string const layout = fromqstr(locallayoutTE->document()->toPlainText());
-       params.local_layout = layout;
+       params.setLocalLayout(layout, false);
 }
 
 
 void LocalLayout::textChanged()
 {
-       static const QString unknown = qt_("Press button to check validity...");
+       static const QString message =
+               qt_("Press button to check validity...");
+       string const layout =
+               fromqstr(locallayoutTE->document()->toPlainText().trimmed());
 
-       is_valid_ = false;
-       validLB->setText(unknown);
-       validatePB->setEnabled(true);
-       convertPB->setEnabled(false);
-       changed();
+       if (layout.empty()) {
+               validated_ = true;
+               validatePB->setEnabled(false);
+               validLB->setText("");
+               convertPB->hide();
+               convertLB->hide();
+               changed();
+       } else if (!validatePB->isEnabled()) {
+               // if that's already enabled, we shouldn't need to do anything.
+               validated_ = false;
+               validLB->setText(message);
+               validatePB->setEnabled(true);
+               convertPB->setEnabled(false);
+               changed();
+       }
 }
 
 
@@ -599,26 +588,20 @@ void LocalLayout::convertPressed() {
 void LocalLayout::validate() {
        static const QString valid = qt_("Layout is valid!");
        static const QString vtext =
-               toqstr("<p style=\"font-weight: bold; \">") 
+               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; \">") 
+               toqstr("<p style=\"color: #c00000; font-weight: bold; \">")
                  + invalid + toqstr("</p>");
 
-       string const layout = 
+       string const layout =
                fromqstr(locallayoutTE->document()->toPlainText().trimmed());
-       if (layout.empty()) {
-               is_valid_ = true;
-               validatePB->setEnabled(false);
-               validLB->setText("");
-               convertPB->hide();
-               convertLB->hide();
-       } else {
+       if (!layout.empty()) {
                TextClass::ReturnValues const ret = TextClass::validate(layout);
-               is_valid_ = (ret == TextClass::OK) || (ret == TextClass::OK_OLDFORMAT);
+               validated_ = (ret == TextClass::OK) || (ret == TextClass::OK_OLDFORMAT);
                validatePB->setEnabled(false);
-               validLB->setText(is_valid_ ? vtext : ivtext);
+               validLB->setText(validated_ ? vtext : ivtext);
                if (ret == TextClass::OK_OLDFORMAT) {
                        convertPB->show();
                        convertPB->setEnabled(true);
@@ -710,6 +693,8 @@ GuiDocument::GuiDocument(GuiView & lv)
                this, SLOT(change_adaptor()));
        connect(textLayoutModule->twoColumnCB, SIGNAL(clicked()),
                this, SLOT(setColSep()));
+       connect(textLayoutModule->justCB, SIGNAL(clicked()),
+               this, SLOT(change_adaptor()));
 
        textLayoutModule->lspacingLE->setValidator(new QDoubleValidator(
                textLayoutModule->lspacingLE));
@@ -768,6 +753,8 @@ GuiDocument::GuiDocument(GuiView & lv)
                this, SLOT(change_adaptor()));
        connect(outputModule->strictCB, SIGNAL(stateChanged(int)),
                this, SLOT(change_adaptor()));
+       connect(outputModule->cssCB, SIGNAL(stateChanged(int)),
+               this, SLOT(change_adaptor()));
        connect(outputModule->mathoutCB, SIGNAL(currentIndexChanged(int)),
                this, SLOT(change_adaptor()));
 
@@ -780,6 +767,9 @@ GuiDocument::GuiDocument(GuiView & lv)
        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()),
@@ -798,6 +788,10 @@ GuiDocument::GuiDocument(GuiView & lv)
                this, SLOT(change_adaptor()));
        connect(fontModule->fontsTypewriterCO, SIGNAL(activated(int)),
                this, SLOT(ttChanged(int)));
+       connect(fontModule->fontsMathCO, SIGNAL(activated(int)),
+               this, SLOT(change_adaptor()));
+       connect(fontModule->fontsMathCO, SIGNAL(activated(int)),
+               this, SLOT(mathFontChanged(int)));
        connect(fontModule->fontsDefaultCO, SIGNAL(activated(int)),
                this, SLOT(change_adaptor()));
        connect(fontModule->fontencCO, SIGNAL(activated(int)),
@@ -816,8 +810,17 @@ GuiDocument::GuiDocument(GuiView & lv)
                this, SLOT(change_adaptor()));
        connect(fontModule->fontScCB, SIGNAL(clicked()),
                this, SLOT(change_adaptor()));
+       connect(fontModule->fontScCB, SIGNAL(toggled(bool)),
+               this, SLOT(fontScToggled(bool)));
        connect(fontModule->fontOsfCB, SIGNAL(clicked()),
                this, SLOT(change_adaptor()));
+       connect(fontModule->fontOsfCB, SIGNAL(toggled(bool)),
+               this, SLOT(fontOsfToggled(bool)));
+
+       fontModule->fontencLE->setValidator(new NoNewLineValidator(
+               fontModule->fontencLE));
+       fontModule->cjkFontLE->setValidator(new NoNewLineValidator(
+               fontModule->cjkFontLE));
 
        updateFontlist();
 
@@ -826,9 +829,9 @@ 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)"));
+       fontModule->fontencCO->addItem(qt_("Default"), QString("global"));
+       fontModule->fontencCO->addItem(qt_("Custom"), QString("custom"));
+       fontModule->fontencCO->addItem(qt_("None (no fontenc)"), QString("default"));
 
        for (int n = 0; GuiDocument::fontfamilies_gui[n][0]; ++n)
                fontModule->fontsDefaultCO->addItem(
@@ -866,7 +869,7 @@ GuiDocument::GuiDocument(GuiView & lv)
                this, SLOT(change_adaptor()));
        connect(pageLayoutModule->pagestyleCO, SIGNAL(activated(int)),
                this, SLOT(change_adaptor()));
-       
+
        pageLayoutModule->pagestyleCO->addItem(qt_("Default"));
        pageLayoutModule->pagestyleCO->addItem(qt_("empty"));
        pageLayoutModule->pagestyleCO->addItem(qt_("plain"));
@@ -997,6 +1000,8 @@ GuiDocument::GuiDocument(GuiView & lv)
        langModule = new UiWidget<Ui::LanguageUi>;
        connect(langModule->languageCO, SIGNAL(activated(int)),
                this, SLOT(change_adaptor()));
+       connect(langModule->languageCO, SIGNAL(activated(int)),
+               this, SLOT(languageChanged(int)));
        connect(langModule->defaultencodingRB, SIGNAL(clicked()),
                this, SLOT(change_adaptor()));
        connect(langModule->otherencodingRB, SIGNAL(clicked()),
@@ -1007,11 +1012,14 @@ GuiDocument::GuiDocument(GuiView & lv)
                this, SLOT(change_adaptor()));
        connect(langModule->languagePackageCO, SIGNAL(activated(int)),
                this, SLOT(change_adaptor()));
-       connect(langModule->languagePackageED, SIGNAL(textChanged(QString)),
+       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);
@@ -1024,16 +1032,23 @@ GuiDocument::GuiDocument(GuiView & lv)
        Encodings::const_iterator it = encodings.begin();
        Encodings::const_iterator const end = encodings.end();
        for (; it != end; ++it)
-               encodinglist.append(qt_(it->guiName()));
+               if (!it->unsafe())
+                       encodinglist.append(qt_(it->guiName()));
        encodinglist.sort();
        langModule->encodingCO->addItems(encodinglist);
 
-       langModule->quoteStyleCO->addItem(qt_("``text''"));
-       langModule->quoteStyleCO->addItem(qt_("''text''"));
-       langModule->quoteStyleCO->addItem(qt_(",,text``"));
-       langModule->quoteStyleCO->addItem(qt_(",,text''"));
-       langModule->quoteStyleCO->addItem(qt_("<<text>>"));
-       langModule->quoteStyleCO->addItem(qt_(">>text<<"));
+       langModule->quoteStyleCO->addItem(
+               qt_("``text''"),InsetQuotes::EnglishQuotes);
+       langModule->quoteStyleCO->addItem(
+               qt_("''text''"), InsetQuotes::SwedishQuotes);
+       langModule->quoteStyleCO->addItem
+               (qt_(",,text``"), InsetQuotes::GermanQuotes);
+       langModule->quoteStyleCO->addItem(
+               qt_(",,text''"), InsetQuotes::PolishQuotes);
+       langModule->quoteStyleCO->addItem(
+               qt_("<<text>>"), InsetQuotes::FrenchQuotes);
+       langModule->quoteStyleCO->addItem(
+               qt_(">>text<<"), InsetQuotes::DanishQuotes);
 
        langModule->languagePackageCO->addItem(
                qt_("Default"), toqstr("default"));
@@ -1081,29 +1096,39 @@ 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);
-
+       setSectionResizeMode(numberingModule->tocTW->header(), QHeaderView::ResizeToContents);
 
        // biblio
        biblioModule = new UiWidget<Ui::BiblioUi>;
+       connect(biblioModule->citeDefaultRB, SIGNAL(toggled(bool)),
+               this, SLOT(setNumerical(bool)));
+       connect(biblioModule->citeJurabibRB, SIGNAL(toggled(bool)),
+               this, SLOT(setAuthorYear(bool)));
        connect(biblioModule->citeNatbibRB, SIGNAL(toggled(bool)),
                biblioModule->citationStyleL, SLOT(setEnabled(bool)));
        connect(biblioModule->citeNatbibRB, SIGNAL(toggled(bool)),
                biblioModule->citeStyleCO, SLOT(setEnabled(bool)));
        connect(biblioModule->citeDefaultRB, SIGNAL(clicked()),
-               this, SLOT(change_adaptor()));
+               this, SLOT(biblioChanged()));
        connect(biblioModule->citeNatbibRB, SIGNAL(clicked()),
-               this, SLOT(change_adaptor()));
+               this, SLOT(biblioChanged()));
        connect(biblioModule->citeStyleCO, SIGNAL(activated(int)),
-               this, SLOT(change_adaptor()));
+               this, SLOT(biblioChanged()));
        connect(biblioModule->citeJurabibRB, SIGNAL(clicked()),
-               this, SLOT(change_adaptor()));
+               this, SLOT(biblioChanged()));
        connect(biblioModule->bibtopicCB, SIGNAL(clicked()),
-               this, SLOT(change_adaptor()));
+               this, SLOT(biblioChanged()));
        connect(biblioModule->bibtexCO, SIGNAL(activated(int)),
                this, SLOT(bibtexChanged(int)));
-       connect(biblioModule->bibtexOptionsED, SIGNAL(textChanged(QString)),
-               this, SLOT(change_adaptor()));
+       connect(biblioModule->bibtexOptionsLE, SIGNAL(textChanged(QString)),
+               this, SLOT(biblioChanged()));
+       connect(biblioModule->bibtexStyleLE, SIGNAL(textChanged(QString)),
+               this, SLOT(biblioChanged()));
+
+       biblioModule->bibtexOptionsLE->setValidator(new NoNewLineValidator(
+               biblioModule->bibtexOptionsLE));
+       biblioModule->bibtexStyleLE->setValidator(new NoNewLineValidator(
+               biblioModule->bibtexStyleLE));
 
        biblioModule->citeStyleCO->addItem(qt_("Author-year"));
        biblioModule->citeStyleCO->addItem(qt_("Numerical"));
@@ -1127,32 +1152,71 @@ GuiDocument::GuiDocument(GuiView & lv)
 
        // 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)));
-       connect(mathsModule->mhchemautoCB, SIGNAL(toggled(bool)),
-               mathsModule->mhchemCB, SLOT(setDisabled(bool)));
-       connect(mathsModule->mathdotsautoCB, SIGNAL(toggled(bool)),
-               mathsModule->mathdotsCB, SLOT(setDisabled(bool)));
-       
-       connect(mathsModule->amsCB, SIGNAL(clicked()),
-               this, SLOT(change_adaptor()));
-       connect(mathsModule->amsautoCB, SIGNAL(clicked()),
-               this, SLOT(change_adaptor()));
-       connect(mathsModule->esintCB, SIGNAL(clicked()),
-               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()),
+       QStringList headers;
+       headers << qt_("Package") << qt_("Load automatically")
+               << qt_("Load always") << qt_("Do not load");
+       mathsModule->packagesTW->setHorizontalHeaderLabels(headers);
+       setSectionResizeMode(mathsModule->packagesTW->horizontalHeader(), QHeaderView::Stretch);        
+       map<string, string> const & packages = BufferParams::auto_packages();
+       mathsModule->packagesTW->setRowCount(packages.size());
+       int i = 0;
+       for (map<string, string>::const_iterator it = packages.begin();
+            it != packages.end(); ++it) {
+               docstring const package = from_ascii(it->first);
+               QString autoTooltip = qt_(it->second);
+               QString alwaysTooltip;
+               if (package == "amsmath")
+                       alwaysTooltip =
+                               qt_("The AMS LaTeX packages are always used");
+               else
+                       alwaysTooltip = toqstr(bformat(
+                               _("The LaTeX package %1$s is always used"),
+                               package));
+               QString neverTooltip;
+               if (package == "amsmath")
+                       neverTooltip =
+                               qt_("The AMS LaTeX packages are never used");
+               else
+                       neverTooltip = toqstr(bformat(
+                               _("The LaTeX package %1$s is never used"),
+                               package));
+               QRadioButton * autoRB = new QRadioButton(mathsModule);
+               QRadioButton * alwaysRB = new QRadioButton(mathsModule);
+               QRadioButton * neverRB = new QRadioButton(mathsModule);
+               QButtonGroup * packageGroup = new QButtonGroup(mathsModule);
+               packageGroup->addButton(autoRB);
+               packageGroup->addButton(alwaysRB);
+               packageGroup->addButton(neverRB);
+               autoRB->setToolTip(autoTooltip);
+               alwaysRB->setToolTip(alwaysTooltip);
+               neverRB->setToolTip(neverTooltip);
+               QTableWidgetItem * pack = new QTableWidgetItem(toqstr(package));
+               mathsModule->packagesTW->setItem(i, 0, pack);
+               mathsModule->packagesTW->setCellWidget(i, 1, autoRB);
+               mathsModule->packagesTW->setCellWidget(i, 2, alwaysRB);
+               mathsModule->packagesTW->setCellWidget(i, 3, neverRB);
+
+               connect(autoRB, SIGNAL(clicked()),
+                       this, SLOT(change_adaptor()));
+               connect(alwaysRB, SIGNAL(clicked()),
+                       this, SLOT(change_adaptor()));
+               connect(neverRB, SIGNAL(clicked()),
+                       this, SLOT(change_adaptor()));
+               ++i;
+       }
+       connect(mathsModule->allPackagesAutoPB, SIGNAL(clicked()),
+               this, SLOT(allPackagesAuto()));
+       connect(mathsModule->allPackagesAlwaysPB, SIGNAL(clicked()),
+               this, SLOT(allPackagesAlways()));
+       connect(mathsModule->allPackagesNotPB, SIGNAL(clicked()),
+               this, SLOT(allPackagesNot()));
+       connect(mathsModule->allPackagesAutoPB, SIGNAL(clicked()),
+               this, SLOT(change_adaptor()));
+       connect(mathsModule->allPackagesAlwaysPB, SIGNAL(clicked()),
+               this, SLOT(change_adaptor()));
+       connect(mathsModule->allPackagesNotPB, SIGNAL(clicked()),
                this, SLOT(change_adaptor()));
-       
+
 
        // latex class
        latexModule = new UiWidget<Ui::LaTeXUi>;
@@ -1181,13 +1245,17 @@ GuiDocument::GuiDocument(GuiView & lv)
        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) {
                QString enc = qt_(tex_graphics_gui[n]);
                latexModule->psdriverCO->addItem(enc);
        }
        // latex classes
-       latexModule->classCO->setModel(&classes_model_);
        LayoutFileList const & bcl = LayoutFileList::get();
        vector<LayoutFileIndex> classList = bcl.classList();
        sort(classList.begin(), classList.end(), less_textclass_avail_desc());
@@ -1196,10 +1264,22 @@ GuiDocument::GuiDocument(GuiView & lv)
        vector<LayoutFileIndex>::const_iterator cen = classList.end();
        for (int i = 0; cit != cen; ++cit, ++i) {
                LayoutFile const & tc = bcl[*cit];
-               docstring item = (tc.isTeXClassAvailable()) ?
-                       from_utf8(tc.description()) :
-                       bformat(_("Unavailable: %1$s"), from_utf8(tc.description()));
-               classes_model_.insertRow(i, toqstr(item), *cit);
+               bool const available = tc.isTeXClassAvailable();
+               docstring const guiname = translateIfPossible(from_utf8(tc.description()));
+               // tooltip sensu "KOMA-Script Article [Class 'scrartcl']"
+               QString tooltip = toqstr(bformat(_("%1$s [Class '%2$s']"), guiname, from_utf8(tc.latexname())));
+               if (!available) {
+                       docstring const output_type = (tc.outputType() == lyx::DOCBOOK) ? _("DocBook") : _("LaTeX");
+                       tooltip += '\n' + toqstr(wrap(bformat(_("Class not found by LyX. "
+                                                          "Please check if you have the matching %1$s class "
+                                                          "and all required packages (%2$s) installed."),
+                                                        output_type, from_utf8(tc.prerequisites(", ")))));
+               }
+               latexModule->classCO->addItemSort(toqstr(tc.name()),
+                                                 toqstr(guiname),
+                                                 toqstr(translateIfPossible(from_utf8(tc.category()))),
+                                                 tooltip,
+                                                 true, true, true, available);
        }
 
 
@@ -1209,6 +1289,7 @@ GuiDocument::GuiDocument(GuiView & lv)
                this, SLOT(change_adaptor()));
        connect(branchesModule, SIGNAL(renameBranches(docstring const &, docstring const &)),
                this, SLOT(branchesRename(docstring const &, docstring const &)));
+       connect(branchesModule, SIGNAL(okPressed()), this, SLOT(slotOK()));
        updateUnknownBranches();
 
 
@@ -1216,7 +1297,7 @@ GuiDocument::GuiDocument(GuiView & lv)
        preambleModule = new PreambleModule;
        connect(preambleModule, SIGNAL(changed()),
                this, SLOT(change_adaptor()));
-       
+
        localLayout = new LocalLayout;
        connect(localLayout, SIGNAL(changed()),
                this, SLOT(change_adaptor()));
@@ -1231,7 +1312,7 @@ GuiDocument::GuiDocument(GuiView & lv)
        // Modules
        modulesModule = new UiWidget<Ui::ModulesUi>;
        modulesModule->availableLV->header()->setVisible(false);
-       modulesModule->availableLV->header()->setResizeMode(QHeaderView::ResizeToContents);
+       setSectionResizeMode(modulesModule->availableLV->header(), QHeaderView::ResizeToContents);
        modulesModule->availableLV->header()->setStretchLastSection(false);
        selectionManager =
                new ModuleSelectionManager(modulesModule->availableLV,
@@ -1282,6 +1363,17 @@ 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]));
 
@@ -1296,9 +1388,9 @@ GuiDocument::GuiDocument(GuiView & lv)
        listingsModule = new UiWidget<Ui::ListingsSettingsUi>;
        connect(listingsModule->listingsED, SIGNAL(textChanged()),
                this, SLOT(change_adaptor()));
-       connect(listingsModule->bypassCB, SIGNAL(clicked()), 
+       connect(listingsModule->bypassCB, SIGNAL(clicked()),
                this, SLOT(change_adaptor()));
-       connect(listingsModule->bypassCB, SIGNAL(clicked()), 
+       connect(listingsModule->bypassCB, SIGNAL(clicked()),
                this, SLOT(setListingsMessage()));
        connect(listingsModule->listingsED, SIGNAL(textChanged()),
                this, SLOT(setListingsMessage()));
@@ -1307,28 +1399,28 @@ GuiDocument::GuiDocument(GuiView & lv)
 
 
        // 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"));
-       docPS->addPanel(preambleModule, qt_("LaTeX Preamble"));
-       docPS->setCurrentPanel(qt_("Document Class"));
+       docPS->addPanel(latexModule, N_("Document Class"));
+       docPS->addPanel(masterChildModule, N_("Child Documents"));
+       docPS->addPanel(modulesModule, N_("Modules"));
+       docPS->addPanel(localLayout, N_("Local Layout"));
+       docPS->addPanel(fontModule, N_("Fonts"));
+       docPS->addPanel(textLayoutModule, N_("Text Layout"));
+       docPS->addPanel(pageLayoutModule, N_("Page Layout"));
+       docPS->addPanel(marginsModule, N_("Page Margins"));
+       docPS->addPanel(langModule, N_("Language"));
+       docPS->addPanel(colorModule, N_("Colors"));
+       docPS->addPanel(numberingModule, N_("Numbering & TOC"));
+       docPS->addPanel(biblioModule, N_("Bibliography"));
+       docPS->addPanel(indicesModule, N_("Indexes"));
+       docPS->addPanel(pdfSupportModule, N_("PDF Properties"));
+       docPS->addPanel(mathsModule, N_("Math Options"));
+       docPS->addPanel(floatModule, N_("Float Placement"));
+       docPS->addPanel(listingsModule, N_("Listings[[inset]]"));
+       docPS->addPanel(bulletsModule, N_("Bullets"));
+       docPS->addPanel(branchesModule, N_("Branches"));
+       docPS->addPanel(outputModule, N_("Output"));
+       docPS->addPanel(preambleModule, N_("LaTeX Preamble"));
+       docPS->setCurrentPanel("Document Class");
 // FIXME: hack to work around resizing bug in Qt >= 4.2
 // bug verified with Qt 4.2.{0-3} (JSpitzm)
 #if QT_VERSION >= 0x040200
@@ -1369,7 +1461,7 @@ void GuiDocument::includeonlyClicked(QTreeWidgetItem * item, int)
                includeonlys_.remove(child);
        else
                includeonlys_.push_back(child);
-       
+
        updateIncludeonlys();
        changed();
 }
@@ -1379,9 +1471,10 @@ QString GuiDocument::validateListingsParameters()
 {
        // use a cache here to avoid repeated validation
        // of the same parameters
+       // FIXME THREAD
        static string param_cache;
        static QString msg_cache;
-       
+
        if (listingsModule->bypassCB->isChecked())
                return QString();
 
@@ -1396,6 +1489,7 @@ QString GuiDocument::validateListingsParameters()
 
 void GuiDocument::setListingsMessage()
 {
+       // FIXME THREAD
        static bool isOK = true;
        QString msg = validateListingsParameters();
        if (msg.isEmpty()) {
@@ -1527,7 +1621,7 @@ void GuiDocument::setCustomMargins(bool custom)
        marginsModule->footskipLE->setEnabled(!custom);
        marginsModule->footskipUnit->setEnabled(!custom);
 
-       bool const enableColSep = !custom && 
+       bool const enableColSep = !custom &&
                        textLayoutModule->twoColumnCB->checkState() == Qt::Checked;
        marginsModule->columnsepL->setEnabled(enableColSep);
        marginsModule->columnsepLE->setEnabled(enableColSep);
@@ -1645,11 +1739,51 @@ void GuiDocument::deleteBoxBackgroundColor()
 }
 
 
+void GuiDocument::languageChanged(int i)
+{
+       // some languages only work with polyglossia/XeTeX
+       Language const * lang = lyx::languages.getLanguage(
+               fromqstr(langModule->languageCO->itemData(i).toString()));
+       if (lang->babel().empty() && !lang->polyglossia().empty()) {
+                       // If we force to switch fontspec on, store
+                       // current state (#8717)
+                       if (fontModule->osFontsCB->isEnabled())
+                               forced_fontspec_activation =
+                                       !fontModule->osFontsCB->isChecked();
+                       fontModule->osFontsCB->setChecked(true);
+                       fontModule->osFontsCB->setEnabled(false);
+       }
+       else {
+               fontModule->osFontsCB->setEnabled(true);
+               // If we have forced to switch fontspec on,
+               // restore previous state (#8717)
+               if (forced_fontspec_activation)
+                       fontModule->osFontsCB->setChecked(false);
+               forced_fontspec_activation = false;
+       }
+
+       // set appropriate quotation mark style
+       if (!lang->quoteStyle().empty()) {
+               langModule->quoteStyleCO->setCurrentIndex(
+                       bp_.getQuoteStyle(lang->quoteStyle()));
+       }
+}
+
+
 void GuiDocument::osFontsChanged(bool nontexfonts)
 {
        bool const tex_fonts = !nontexfonts;
        updateFontlist();
+       // store default format
+       QString const dformat = outputModule->defaultFormatCO->itemData(
+               outputModule->defaultFormatCO->currentIndex()).toString();
        updateDefaultFormat();
+       // try to restore default format
+       int index = outputModule->defaultFormatCO->findData(dformat);
+       // set to default if format is not found
+       if (index == -1)
+               index = 0;
+       outputModule->defaultFormatCO->setCurrentIndex(index);
        langModule->encodingCO->setEnabled(tex_fonts &&
                !langModule->defaultencodingRB->isChecked());
        langModule->defaultencodingRB->setEnabled(tex_fonts);
@@ -1659,28 +1793,68 @@ void GuiDocument::osFontsChanged(bool nontexfonts)
        fontModule->fontsDefaultLA->setEnabled(tex_fonts);
        fontModule->cjkFontLE->setEnabled(tex_fonts);
        fontModule->cjkFontLA->setEnabled(tex_fonts);
-       string font;
+
+       updateFontOptions();
+
+       fontModule->fontencLA->setEnabled(tex_fonts);
+       fontModule->fontencCO->setEnabled(tex_fonts);
+       if (!tex_fonts)
+               fontModule->fontencLE->setEnabled(false);
+       else
+               fontencChanged(fontModule->fontencCO->currentIndex()); 
+}
+
+
+void GuiDocument::mathFontChanged(int)
+{
+       updateFontOptions();
+}
+
+
+void GuiDocument::fontOsfToggled(bool state)
+{
+       if (fontModule->osFontsCB->isChecked())
+               return;
+       QString font = fontModule->fontsRomanCO->itemData(
+                       fontModule->fontsRomanCO->currentIndex()).toString();
+       if (hasMonolithicExpertSet(font))
+               fontModule->fontScCB->setChecked(state);
+}
+
+
+void GuiDocument::fontScToggled(bool state)
+{
+       if (fontModule->osFontsCB->isChecked())
+               return;
+       QString font = fontModule->fontsRomanCO->itemData(
+                       fontModule->fontsRomanCO->currentIndex()).toString();
+       if (hasMonolithicExpertSet(font))
+               fontModule->fontOsfCB->setChecked(state);
+}
+
+
+void GuiDocument::updateFontOptions()
+{
+       bool const tex_fonts = !fontModule->osFontsCB->isChecked();
+       QString font;
        if (tex_fonts)
-               font = tex_fonts_sans[fontModule->fontsSansCO->currentIndex()];
+               font = fontModule->fontsSansCO->itemData(
+                               fontModule->fontsSansCO->currentIndex()).toString();
        bool scaleable = providesScale(font);
        fontModule->scaleSansSB->setEnabled(scaleable);
        fontModule->scaleSansLA->setEnabled(scaleable);
        if (tex_fonts)
-               font = tex_fonts_monospaced[fontModule->fontsTypewriterCO->currentIndex()];
+               font = fontModule->fontsTypewriterCO->itemData(
+                               fontModule->fontsTypewriterCO->currentIndex()).toString();
        scaleable = providesScale(font);
        fontModule->scaleTypewriterSB->setEnabled(scaleable);
        fontModule->scaleTypewriterLA->setEnabled(scaleable);
        if (tex_fonts)
-               font = tex_fonts_roman[fontModule->fontsRomanCO->currentIndex()];
+               font = fontModule->fontsRomanCO->itemData(
+                               fontModule->fontsRomanCO->currentIndex()).toString();
        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());
+       updateMathFonts(font);
 }
 
 
@@ -1702,18 +1876,78 @@ void GuiDocument::updateFontsize(string const & items, string const & sel)
 }
 
 
+bool GuiDocument::ot1() const
+{
+       QString const fontenc =
+               fontModule->fontencCO->itemData(fontModule->fontencCO->currentIndex()).toString();
+       return (fontenc == "default"
+               || (fontenc == "global" && (lyxrc.fontenc == "default" || lyxrc.fontenc == "OT1"))
+               || (fontenc == "custom" && fontModule->fontencLE->text() == "OT1"));
+}
+
+
+bool GuiDocument::completeFontset() const
+{
+       return (fontModule->fontsSansCO->itemData(
+                       fontModule->fontsSansCO->currentIndex()).toString() == "default"
+               && fontModule->fontsSansCO->itemData(
+                       fontModule->fontsSansCO->currentIndex()).toString() == "default");
+}
+
+
+bool GuiDocument::noMathFont() const
+{
+       return (fontModule->fontsMathCO->itemData(
+               fontModule->fontsMathCO->currentIndex()).toString() == "default");
+}
+
+
+void GuiDocument::updateTexFonts()
+{
+       LaTeXFonts::TexFontMap texfontmap = theLaTeXFonts().getLaTeXFonts();
+
+       LaTeXFonts::TexFontMap::const_iterator it = texfontmap.begin();
+       LaTeXFonts::TexFontMap::const_iterator end = texfontmap.end();
+       for (; it != end; ++it) {
+               LaTeXFont lf = it->second;
+               if (lf.name().empty()) {
+                       LYXERR0("Error: Unnamed font: " << it->first);
+                       continue;
+               }
+               docstring const family = lf.family();
+               docstring guiname = translateIfPossible(lf.guiname());
+               if (!lf.available(ot1(), noMathFont()))
+                       guiname += _(" (not installed)");
+               if (family == "rm")
+                       rmfonts_.insert(toqstr(guiname), toqstr(it->first));
+               else if (family == "sf")
+                       sffonts_.insert(toqstr(guiname), toqstr(it->first));
+               else if (family == "tt")
+                       ttfonts_.insert(toqstr(guiname), toqstr(it->first));
+               else if (family == "math")
+                       mathfonts_.insert(toqstr(guiname), toqstr(it->first));
+       }
+}
+
+
 void GuiDocument::updateFontlist()
 {
        fontModule->fontsRomanCO->clear();
        fontModule->fontsSansCO->clear();
        fontModule->fontsTypewriterCO->clear();
+       fontModule->fontsMathCO->clear();
 
-       // With XeTeX, we have access to all system fonts, but not the LaTeX fonts
+       // With fontspec (XeTeX, LuaTeX), we have access to all system fonts, but not the LaTeX fonts
        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"));
-       
+               QString unimath = qt_("Non-TeX Fonts Default");
+               if (!LaTeXFeatures::isAvailable("unicode-math"))
+                       unimath += qt_(" (not available)");
+               fontModule->fontsMathCO->addItem(qt_("Class Default (TeX Fonts)"), QString("auto"));
+               fontModule->fontsMathCO->addItem(unimath, QString("default"));
+
                QFontDatabase fontdb;
                QStringList families(fontdb.families());
                for (QStringList::Iterator it = families.begin(); it != families.end(); ++it) {
@@ -1724,30 +1958,65 @@ void GuiDocument::updateFontlist()
                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, qt_(tex_fonts_roman[n]));
+       if (rmfonts_.empty())
+               updateTexFonts();
+
+       fontModule->fontsRomanCO->addItem(qt_("Default"), QString("default"));
+       QMap<QString, QString>::const_iterator rmi = rmfonts_.constBegin();
+       while (rmi != rmfonts_.constEnd()) {
+               fontModule->fontsRomanCO->addItem(rmi.key(), rmi.value());
+               ++rmi;
        }
-       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, qt_(tex_fonts_sans[n]));
+       
+       fontModule->fontsSansCO->addItem(qt_("Default"), QString("default"));
+       QMap<QString, QString>::const_iterator sfi = sffonts_.constBegin();
+       while (sfi != sffonts_.constEnd()) {
+               fontModule->fontsSansCO->addItem(sfi.key(), sfi.value());
+               ++sfi;
+       }
+       
+       fontModule->fontsTypewriterCO->addItem(qt_("Default"), QString("default"));
+       QMap<QString, QString>::const_iterator tti = ttfonts_.constBegin();
+       while (tti != ttfonts_.constEnd()) {
+               fontModule->fontsTypewriterCO->addItem(tti.key(), tti.value());
+               ++tti;
        }
-       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, qt_(tex_fonts_monospaced[n]));
+
+       fontModule->fontsMathCO->addItem(qt_("Automatic"), QString("auto"));
+       fontModule->fontsMathCO->addItem(qt_("Class Default"), QString("default"));
+       QMap<QString, QString>::const_iterator mmi = mathfonts_.constBegin();
+       while (mmi != mathfonts_.constEnd()) {
+               fontModule->fontsMathCO->addItem(mmi.key(), mmi.value());
+               ++mmi;
        }
 }
 
 
 void GuiDocument::fontencChanged(int item)
 {
-       fontModule->fontencLE->setEnabled(item == 1);
+       fontModule->fontencLE->setEnabled(
+               fontModule->fontencCO->itemData(item).toString() == "custom");
+       // The availability of TeX fonts depends on the font encoding
+       updateTexFonts();
+       updateFontOptions();
+}
+
+
+void GuiDocument::updateMathFonts(QString const & rm)
+{
+       if (fontModule->osFontsCB->isChecked())
+               return;
+       QString const math =
+               fontModule->fontsMathCO->itemData(fontModule->fontsMathCO->currentIndex()).toString();
+       int const i = fontModule->fontsMathCO->findData("default");
+       if (providesNoMath(rm) && i == -1)
+               fontModule->fontsMathCO->insertItem(1, qt_("Class Default"), QString("default"));
+       else if (!providesNoMath(rm) && i != -1) {
+               int const c = fontModule->fontsMathCO->currentIndex();
+               fontModule->fontsMathCO->removeItem(i);
+               if (c == i)
+                       fontModule->fontsMathCO->setCurrentIndex(0);
+       }
 }
 
 
@@ -1755,9 +2024,11 @@ void GuiDocument::romanChanged(int item)
 {
        if (fontModule->osFontsCB->isChecked())
                return;
-       string const font = tex_fonts_roman[item];
+       QString const font =
+               fontModule->fontsRomanCO->itemData(item).toString();
        fontModule->fontScCB->setEnabled(providesSC(font));
        fontModule->fontOsfCB->setEnabled(providesOSF(font));
+       updateMathFonts(font);
 }
 
 
@@ -1765,7 +2036,8 @@ void GuiDocument::sansChanged(int item)
 {
        if (fontModule->osFontsCB->isChecked())
                return;
-       string const font = tex_fonts_sans[item];
+       QString const font =
+               fontModule->fontsSansCO->itemData(item).toString();
        bool scaleable = providesScale(font);
        fontModule->scaleSansSB->setEnabled(scaleable);
        fontModule->scaleSansLA->setEnabled(scaleable);
@@ -1776,7 +2048,8 @@ void GuiDocument::ttChanged(int item)
 {
        if (fontModule->osFontsCB->isChecked())
                return;
-       string const font = tex_fonts_monospaced[item];
+       QString const font =
+               fontModule->fontsTypewriterCO->itemData(item).toString();
        bool scaleable = providesScale(font);
        fontModule->scaleTypewriterSB->setEnabled(scaleable);
        fontModule->scaleTypewriterLA->setEnabled(scaleable);
@@ -1826,7 +2099,7 @@ void GuiDocument::browseLayout()
 
        FileName layoutFile = support::makeAbsPath(fromqstr(file),
                fromqstr(bufferFilePath()));
-       
+
        int const ret = Alert::prompt(_("Local layout file"),
                _("The layout file you have selected is a local layout\n"
                  "file, not one in the system or user directory. Your\n"
@@ -1846,22 +2119,29 @@ void GuiDocument::browseLayout()
 
        if (name.empty()) {
                Alert::error(_("Error"),
-                       _("Unable to read local layout file."));                
+                       _("Unable to read local layout file."));
                return;
        }
 
        // do not trigger classChanged if there is no change.
        if (latexModule->classCO->currentText() == toqstr(name))
                return;
-               
+
        // add to combo box
-       int idx = latexModule->classCO->findText(toqstr(name));
-       if (idx == -1) {
-               classes_model_.insertRow(0, toqstr(name), name);
-               latexModule->classCO->setCurrentIndex(0);
-       } else
-               latexModule->classCO->setCurrentIndex(idx);
-       
+       bool const avail = latexModule->classCO->set(toqstr(name));
+       if (!avail) {
+               LayoutFile const & tc = bcl[name];
+               docstring const guiname = translateIfPossible(from_utf8(tc.description()));
+               // tooltip sensu "KOMA-Script Article [Class 'scrartcl']"
+               QString tooltip = toqstr(bformat(_("%1$s [Class '%2$s']"), guiname, from_utf8(tc.latexname())));
+               tooltip += '\n' + qt_("This is a local layout file.");
+               latexModule->classCO->addItemSort(toqstr(tc.name()), toqstr(guiname),
+                                                 toqstr(translateIfPossible(from_utf8(tc.category()))),
+                                                 tooltip,
+                                                 true, true, true, true);
+               latexModule->classCO->set(toqstr(name));
+       }
+
        classChanged();
 }
 
@@ -1884,9 +2164,9 @@ void GuiDocument::browseMaster()
 void GuiDocument::classChanged()
 {
        int idx = latexModule->classCO->currentIndex();
-       if (idx < 0) 
+       if (idx < 0)
                return;
-       string const classname = classes_model_.getIDString(idx);
+       string const classname = fromqstr(latexModule->classCO->getData(idx));
 
        // check whether the selected modules have changed.
        bool modules_changed = false;
@@ -1916,8 +2196,8 @@ void GuiDocument::classChanged()
 
        // We load the TextClass as soon as it is selected. This is
        // necessary so that other options in the dialog can be updated
-       // according to the new class. Note, however, that, if you use 
-       // the scroll wheel when sitting on the combo box, we'll load a 
+       // according to the new class. Note, however, that, if you use
+       // the scroll wheel when sitting on the combo box, we'll load a
        // lot of TextClass objects very quickly....
        if (!bp_.setBaseClass(classname)) {
                Alert::error(_("Error"), _("Unable to set document class."));
@@ -1926,11 +2206,11 @@ void GuiDocument::classChanged()
        if (lyxrc.auto_reset_options)
                bp_.useClassDefaults();
 
-       // With the introduction of modules came a distinction between the base 
-       // class and the document class. The former corresponds to the main layout 
+       // With the introduction of modules came a distinction between the base
+       // class and the document class. The former corresponds to the main layout
        // file; the latter is that plus the modules (or the document-specific layout,
-       // or  whatever else there could be). Our parameters come from the document 
-       // class. So when we set the base class, we also need to recreate the document 
+       // or  whatever else there could be). Our parameters come from the document
+       // class. So when we set the base class, we also need to recreate the document
        // class. Otherwise, we still have the old one.
        bp_.makeDocumentClass();
        paramsToDialog();
@@ -1939,31 +2219,91 @@ void GuiDocument::classChanged()
 
 void GuiDocument::languagePackageChanged(int i)
 {
-        langModule->languagePackageED->setEnabled(
+        langModule->languagePackageLE->setEnabled(
                langModule->languagePackageCO->itemData(i).toString() == "custom");
 }
 
 
+void GuiDocument::biblioChanged()
+{
+       biblioChanged_ = true;
+       changed();
+}
+
+
 void GuiDocument::bibtexChanged(int n)
 {
-       biblioModule->bibtexOptionsED->setEnabled(
+       biblioModule->bibtexOptionsLE->setEnabled(
                biblioModule->bibtexCO->itemData(n).toString() != "default");
-       changed();
+       biblioChanged();
+}
+
+
+void GuiDocument::setAuthorYear(bool authoryear)
+{
+       if (authoryear)
+               biblioModule->citeStyleCO->setCurrentIndex(0);
+       biblioChanged();
+}
+
+
+void GuiDocument::setNumerical(bool numerical)
+{
+       if (numerical)
+               biblioModule->citeStyleCO->setCurrentIndex(1);
+       biblioChanged();
+}
+
+
+void GuiDocument::updateEngineType(string const & items, CiteEngineType const & sel)
+{
+       engine_types_.clear();
+
+       int nn = 0;
+
+       for (int n = 0; !token(items, '|', n).empty(); ++n) {
+               nn += 1;
+               string style = token(items, '|', n);
+               engine_types_.push_back(style);
+       }
+
+       switch (sel) {
+               case ENGINE_TYPE_AUTHORYEAR:
+                       biblioModule->citeStyleCO->setCurrentIndex(0);
+                       break;
+               case ENGINE_TYPE_NUMERICAL:
+               case ENGINE_TYPE_DEFAULT:
+                       biblioModule->citeStyleCO->setCurrentIndex(1);
+                       break;
+       }
+
+       biblioModule->citationStyleL->setEnabled(nn > 1);
+       biblioModule->citeStyleCO->setEnabled(nn > 1);
+
+       if (nn != 1)
+               return;
+
+       // If the textclass allows only one of authoryear or numerical,
+       // we have no choice but to force that engine type.
+       if (engine_types_[0] == "authoryear")
+               biblioModule->citeStyleCO->setCurrentIndex(0);
+       else
+               biblioModule->citeStyleCO->setCurrentIndex(1);
 }
 
 
 namespace {
-       // FIXME unicode 
+       // 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) 
+       docstring formatStrVec(vector<string> const & v, docstring const & s)
        {
                //this mess formats the list as "v[0], v[1], ..., [s] v[n]"
-               if (v.size() == 0)
+               if (v.empty())
                        return docstring();
-               if (v.size() == 1) 
+               if (v.size() == 1)
                        return translateIfPossible(from_utf8(v[0]));
                if (v.size() == 2) {
                        docstring retval = _("%1$s and %2$s");
@@ -1976,14 +2316,14 @@ namespace {
                docstring t2 = _("%1$s, %2$s");
                docstring retval = translateIfPossible(from_utf8(v[0]));
                for (int i = 1; i < vSize - 2; ++i)
-                       retval = bformat(t2, retval, translateIfPossible(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, translateIfPossible(from_utf8(v[vSize - 2])),
                               translateIfPossible(from_utf8(v[vSize - 1])));
        }
-       
+
        vector<string> idsToNames(vector<string> const & idList)
        {
                vector<string> retval;
@@ -1992,7 +2332,7 @@ namespace {
                for (; it != end; ++it) {
                        LyXModule const * const mod = theModuleList[*it];
                        if (!mod)
-                               retval.push_back(to_utf8(bformat(_("%1$s (unavailable)"), 
+                               retval.push_back(to_utf8(bformat(_("%1$s (unavailable)"),
                                                translateIfPossible(from_utf8(*it)))));
                        else
                                retval.push_back(mod->getName());
@@ -2017,11 +2357,11 @@ void GuiDocument::modulesToParams(BufferParams & bp)
        list<string>::const_iterator ren = reqmods.end();
 
        // check each of the default modules
-       for (; rit != ren; rit++) {
+       for (; rit != ren; ++rit) {
                list<string>::const_iterator mit = bp.getModules().begin();
                list<string>::const_iterator men = bp.getModules().end();
                bool found = false;
-               for (; mit != men; mit++) {
+               for (; mit != men; ++mit) {
                        if (*rit == *mit) {
                                found = true;
                                break;
@@ -2045,20 +2385,20 @@ void GuiDocument::modulesChanged()
 void GuiDocument::updateModuleInfo()
 {
        selectionManager->update();
-       
+
        //Module description
        bool const focus_on_selected = selectionManager->selectedFocused();
        QAbstractItemView * lv;
        if (focus_on_selected)
                lv = modulesModule->selectedLV;
        else
-               lv= modulesModule->availableLV;
+               lv = modulesModule->availableLV;
        if (lv->selectionModel()->selectedIndexes().isEmpty()) {
                modulesModule->infoML->document()->clear();
                return;
        }
        QModelIndex const & idx = lv->selectionModel()->currentIndex();
-       GuiIdListModel const & id_model = 
+       GuiIdListModel const & id_model =
                        focus_on_selected  ? modules_sel_model_ : modules_av_model_;
        string const modName = id_model.getIDString(idx.row());
        docstring desc = getModuleDescription(modName);
@@ -2070,6 +2410,13 @@ void GuiDocument::updateModuleInfo()
                desc += _("Module provided by document class.");
        }
 
+       docstring cat = getModuleCategory(modName);
+       if (!cat.empty()) {
+               if (!desc.empty())
+                       desc += "\n";
+               desc += bformat(_("Category: %1$s."), cat);
+       }
+
        vector<string> pkglist = getPackageList(modName);
        docstring pkgdesc = formatStrVec(pkglist, _("and"));
        if (!pkgdesc.empty()) {
@@ -2123,7 +2470,7 @@ void GuiDocument::updateNumbering()
        DocumentClass::const_iterator len = tclass.end();
        for (; lit != len; ++lit) {
                int const toclevel = lit->toclevel;
-               if (toclevel != Layout::NOT_IN_TOC && lit->labeltype == LABEL_COUNTER) {
+               if (toclevel != Layout::NOT_IN_TOC && !lit->counter.empty()) {
                        item = new QTreeWidgetItem(numberingModule->tocTW);
                        item->setText(0, toqstr(translateIfPossible(lit->name())));
                        item->setText(1, (toclevel <= depth) ? yes : no);
@@ -2145,9 +2492,9 @@ void GuiDocument::updateDefaultFormat()
        param_copy.useNonTeXFonts = fontModule->osFontsCB->isChecked();
        int const idx = latexModule->classCO->currentIndex();
        if (idx >= 0) {
-               string const classname = classes_model_.getIDString(idx);
+               string const classname = fromqstr(latexModule->classCO->getData(idx));
                param_copy.setBaseClass(classname);
-               param_copy.makeDocumentClass();
+               param_copy.makeDocumentClass(true);
        }
        outputModule->defaultFormatCO->blockSignals(true);
        outputModule->defaultFormatCO->clear();
@@ -2155,6 +2502,7 @@ void GuiDocument::updateDefaultFormat()
                                QVariant(QString("default")));
        typedef vector<Format const *> Formats;
        Formats formats = param_copy.exportableFormats(true);
+       sort(formats.begin(), formats.end(), Format::formatSorter);
        Formats::const_iterator cit = formats.begin();
        Formats::const_iterator end = formats.end();
        for (; cit != end; ++cit)
@@ -2184,32 +2532,40 @@ void GuiDocument::applyView()
        bp_.use_refstyle  = latexModule->refstyleCB->isChecked();
 
        // biblio
-       bp_.setCiteEngine(ENGINE_BASIC);
-
-       if (biblioModule->citeNatbibRB->isChecked()) {
-               bool const use_numerical_citations =
-                       biblioModule->citeStyleCO->currentIndex();
-               if (use_numerical_citations)
-                       bp_.setCiteEngine(ENGINE_NATBIB_NUMERICAL);
-               else
-                       bp_.setCiteEngine(ENGINE_NATBIB_AUTHORYEAR);
-
-       } else if (biblioModule->citeJurabibRB->isChecked())
-               bp_.setCiteEngine(ENGINE_JURABIB);
+       if (biblioModule->citeNatbibRB->isChecked())
+               bp_.setCiteEngine("natbib");
+       else if (biblioModule->citeJurabibRB->isChecked())
+               bp_.setCiteEngine("jurabib");
+       if (biblioModule->citeDefaultRB->isChecked()) {
+               bp_.setCiteEngine("basic");
+               bp_.setCiteEngineType(ENGINE_TYPE_DEFAULT);
+       }
+       else
+       if (biblioModule->citeStyleCO->currentIndex())
+               bp_.setCiteEngineType(ENGINE_TYPE_NUMERICAL);
+       else
+               bp_.setCiteEngineType(ENGINE_TYPE_AUTHORYEAR);
 
        bp_.use_bibtopic =
                biblioModule->bibtopicCB->isChecked();
 
+       bp_.biblio_style = fromqstr(biblioModule->bibtexStyleLE->text());
+
        string const bibtex_command =
                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
                bp_.bibtex_command = bibtex_command + " " + bibtex_options;
 
+       if (biblioChanged_) {
+               buffer().invalidateBibinfoCache();
+               buffer().removeBiblioTempFiles();
+       }
+
        // Indices
        indicesModule->apply(bp_);
 
@@ -2227,8 +2583,9 @@ void GuiDocument::applyView()
                        Encodings::const_iterator const end = encodings.end();
                        bool found = false;
                        for (; it != end; ++it) {
-                               if (qt_(it->guiName()) == enc_gui) {
-                                       bp_.inputenc = it->latexName();
+                               if (qt_(it->guiName()) == enc_gui &&
+                                   !it->unsafe()) {
+                                       bp_.inputenc = it->name();
                                        found = true;
                                        break;
                                }
@@ -2241,38 +2598,18 @@ void GuiDocument::applyView()
                }
        }
 
-       InsetQuotes::QuoteLanguage lga = InsetQuotes::EnglishQuotes;
-       switch (langModule->quoteStyleCO->currentIndex()) {
-       case 0:
-               lga = InsetQuotes::EnglishQuotes;
-               break;
-       case 1:
-               lga = InsetQuotes::SwedishQuotes;
-               break;
-       case 2:
-               lga = InsetQuotes::GermanQuotes;
-               break;
-       case 3:
-               lga = InsetQuotes::PolishQuotes;
-               break;
-       case 4:
-               lga = InsetQuotes::FrenchQuotes;
-               break;
-       case 5:
-               lga = InsetQuotes::DanishQuotes;
-               break;
-       }
-       bp_.quotes_language = lga;
+       bp_.quotes_language = (InsetQuotes::QuoteLanguage) langModule->quoteStyleCO->itemData(
+               langModule->quoteStyleCO->currentIndex()).toInt();
 
        QString const lang = langModule->languageCO->itemData(
                langModule->languageCO->currentIndex()).toString();
        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->languagePackageED->text());
+                       fromqstr(langModule->languagePackageLE->text());
        else
                bp_.lang_package = fromqstr(pack);
 
@@ -2299,11 +2636,11 @@ void GuiDocument::applyView()
        // packages
        bp_.graphics_driver =
                tex_graphics[latexModule->psdriverCO->currentIndex()];
-       
+
        // text layout
        int idx = latexModule->classCO->currentIndex();
        if (idx >= 0) {
-               string const classname = classes_model_.getIDString(idx);
+               string const classname = fromqstr(latexModule->classCO->getData(idx));
                bp_.setBaseClass(classname);
        }
 
@@ -2311,39 +2648,28 @@ void GuiDocument::applyView()
        modulesToParams(bp_);
 
        // Math
-       if (mathsModule->amsautoCB->isChecked())
-               bp_.use_amsmath = BufferParams::package_auto;
-       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 {
-               if (mathsModule->esintCB->isChecked())
-                       bp_.use_esint = BufferParams::package_on;
-               else
-                       bp_.use_esint = BufferParams::package_off;
-       }
-       if (mathsModule->mhchemautoCB->isChecked())
-               bp_.use_mhchem = BufferParams::package_auto;
-       else {
-               if (mathsModule->mhchemCB->isChecked())
-                       bp_.use_mhchem = BufferParams::package_on;
-               else
-                       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;
+       map<string, string> const & packages = BufferParams::auto_packages();
+       for (map<string, string>::const_iterator it = packages.begin();
+            it != packages.end(); ++it) {
+               QTableWidgetItem * item = mathsModule->packagesTW->findItems(toqstr(it->first), Qt::MatchExactly)[0];
+               if (!item)
+                       continue;
+               int row = mathsModule->packagesTW->row(item);
+               QRadioButton * rb = (QRadioButton*)mathsModule->packagesTW->cellWidget(row, 1);
+               if (rb->isChecked()) {
+                       bp_.use_package(it->first, BufferParams::package_auto);
+                       continue;
+               }
+               rb = (QRadioButton*)mathsModule->packagesTW->cellWidget(row, 2);
+               if (rb->isChecked()) {
+                       bp_.use_package(it->first, BufferParams::package_on);
+                       continue;
+               }
+               rb = (QRadioButton*)mathsModule->packagesTW->cellWidget(row, 3);
+               if (rb->isChecked())
+                       bp_.use_package(it->first, BufferParams::package_off);
        }
-       
+
        // Page Layout
        if (pageLayoutModule->pagestyleCO->currentIndex() == 0)
                bp_.pagestyle = "default";
@@ -2380,6 +2706,8 @@ void GuiDocument::applyView()
        else
                bp_.columns = 1;
 
+       bp_.justification = textLayoutModule->justCB->isChecked();
+
        if (textLayoutModule->indentRB->isChecked()) {
                // if paragraphs are separated by an indentation
                bp_.paragraph_separation = BufferParams::ParagraphIndentSeparation;
@@ -2468,6 +2796,7 @@ void GuiDocument::applyView()
        bp_.useNonTeXFonts = nontexfonts;
 
        bp_.output_sync = outputModule->outputsyncCB->isChecked();
+       
        bp_.output_sync_macro = fromqstr(outputModule->synccustomCB->currentText());
 
        int mathfmt = outputModule->mathoutCB->currentIndex();
@@ -2477,6 +2806,7 @@ void GuiDocument::applyView()
                static_cast<BufferParams::MathOutput>(mathfmt);
        bp_.html_math_output = mo;
        bp_.html_be_strict = outputModule->strictCB->isChecked();
+       bp_.html_css_as_file = outputModule->cssCB->isChecked();
        bp_.html_math_img_scale = outputModule->mathimgSB->value();
 
        // fonts
@@ -2492,12 +2822,16 @@ void GuiDocument::applyView()
                fromqstr(fontModule->fontsTypewriterCO->
                        itemData(fontModule->fontsTypewriterCO->currentIndex()).toString());
 
-       if (fontModule->fontencCO->currentIndex() == 0)
-               bp_.fontenc = "global";
-       else if (fontModule->fontencCO->currentIndex() == 1)
+       bp_.fonts_math =
+               fromqstr(fontModule->fontsMathCO->
+                       itemData(fontModule->fontsMathCO->currentIndex()).toString());
+
+       QString const fontenc =
+               fontModule->fontencCO->itemData(fontModule->fontencCO->currentIndex()).toString();
+       if (fontenc == "custom")
                bp_.fontenc = fromqstr(fontModule->fontencLE->text());
-       else if (fontModule->fontencCO->currentIndex() == 2)
-               bp_.fontenc = "default";
+       else
+               bp_.fontenc = fromqstr(fontenc);
 
        bp_.fonts_cjk =
                fromqstr(fontModule->cjkFontLE->text());
@@ -2590,7 +2924,7 @@ void GuiDocument::applyView()
 void GuiDocument::paramsToDialog()
 {
        // set the default unit
-       Length::UNIT const defaultUnit = Length::defaultUnit();
+       Length::UNIT const default_unit = Length::defaultUnit();
 
        // preamble
        preambleModule->update(bp_, id());
@@ -2601,22 +2935,28 @@ void GuiDocument::paramsToDialog()
        latexModule->refstyleCB->setChecked(bp_.use_refstyle);
 
        // biblio
+       string const cite_engine = bp_.citeEngine().list().front();
+
        biblioModule->citeDefaultRB->setChecked(
-               bp_.citeEngine() == ENGINE_BASIC);
+               cite_engine == "basic");
+
+       biblioModule->citeJurabibRB->setChecked(
+               cite_engine == "jurabib");
 
        biblioModule->citeNatbibRB->setChecked(
-               bp_.citeEngine() == ENGINE_NATBIB_NUMERICAL ||
-               bp_.citeEngine() == ENGINE_NATBIB_AUTHORYEAR);
+               cite_engine == "natbib");
 
        biblioModule->citeStyleCO->setCurrentIndex(
-               bp_.citeEngine() == ENGINE_NATBIB_NUMERICAL);
+               bp_.citeEngineType() & ENGINE_TYPE_NUMERICAL);
 
-       biblioModule->citeJurabibRB->setChecked(
-               bp_.citeEngine() == ENGINE_JURABIB);
+       updateEngineType(documentClass().opt_enginetype(),
+               bp_.citeEngineType());
 
        biblioModule->bibtopicCB->setChecked(
                bp_.use_bibtopic);
 
+       biblioModule->bibtexStyleLE->setText(toqstr(bp_.biblio_style));
+
        string command;
        string options =
                split(bp_.bibtex_command, command, ' ');
@@ -2624,17 +2964,19 @@ 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 {
                // 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->bibtexOptionsED->clear();
+               biblioModule->bibtexOptionsLE->clear();
        }
-       biblioModule->bibtexOptionsED->setEnabled(
+       biblioModule->bibtexOptionsLE->setEnabled(
                biblioModule->bibtexCO->currentIndex() != 0);
 
+       biblioChanged_ = false;
+
        // indices
        indicesModule->update(bp_);
 
@@ -2656,7 +2998,8 @@ void GuiDocument::paramsToDialog()
                        Encodings::const_iterator it = encodings.begin();
                        Encodings::const_iterator const end = encodings.end();
                        for (; it != end; ++it) {
-                               if (it->latexName() == bp_.inputenc) {
+                               if (it->name() == bp_.inputenc &&
+                                   !it->unsafe()) {
                                        enc_gui = it->guiName();
                                        break;
                                }
@@ -2677,10 +3020,10 @@ void GuiDocument::paramsToDialog()
        if (p == -1) {
                langModule->languagePackageCO->setCurrentIndex(
                          langModule->languagePackageCO->findData("custom"));
-               langModule->languagePackageED->setText(toqstr(bp_.lang_package));
+               langModule->languagePackageLE->setText(toqstr(bp_.lang_package));
        } else {
                langModule->languagePackageCO->setCurrentIndex(p);
-               langModule->languagePackageED->clear();
+               langModule->languagePackageLE->clear();
        }
 
        //color
@@ -2735,26 +3078,32 @@ void GuiDocument::paramsToDialog()
        if (nitem >= 0)
                latexModule->psdriverCO->setCurrentIndex(nitem);
        updateModuleInfo();
-       
-       mathsModule->amsCB->setChecked(
-               bp_.use_amsmath == BufferParams::package_on);
-       mathsModule->amsautoCB->setChecked(
-               bp_.use_amsmath == BufferParams::package_auto);
-
-       mathsModule->esintCB->setChecked(
-               bp_.use_esint == BufferParams::package_on);
-       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);
+
+       map<string, string> const & packages = BufferParams::auto_packages();
+       for (map<string, string>::const_iterator it = packages.begin();
+            it != packages.end(); ++it) {
+               QTableWidgetItem * item = mathsModule->packagesTW->findItems(toqstr(it->first), Qt::MatchExactly)[0];
+               if (!item)
+                       continue;
+               int row = mathsModule->packagesTW->row(item);
+               switch (bp_.use_package(it->first)) {
+                       case BufferParams::package_off: {
+                               QRadioButton * rb = (QRadioButton*)mathsModule->packagesTW->cellWidget(row, 3);
+                               rb->setChecked(true);
+                               break;
+                       }
+                       case BufferParams::package_on: {
+                               QRadioButton * rb = (QRadioButton*)mathsModule->packagesTW->cellWidget(row, 2);
+                               rb->setChecked(true);
+                               break;
+                       }
+                       case BufferParams::package_auto: {
+                               QRadioButton * rb = (QRadioButton*)mathsModule->packagesTW->cellWidget(row, 1);
+                               rb->setChecked(true);
+                               break;
+                       }
+               }
+       }
 
        switch (bp_.spacing().getSpace()) {
                case Spacing::Other: nitem = 3; break;
@@ -2784,7 +3133,7 @@ void GuiDocument::paramsToDialog()
                if (indentation != "default") {
                        lengthToWidgets(textLayoutModule->indentLE,
                        textLayoutModule->indentLengthCO,
-                       indentation, defaultUnit);
+                       indentation, default_unit);
                        indent = 1;
                }
                textLayoutModule->indentCO->setCurrentIndex(indent);
@@ -2808,7 +3157,7 @@ void GuiDocument::paramsToDialog()
                        string const length = bp_.getDefSkip().asLyXCommand();
                        lengthToWidgets(textLayoutModule->skipLE,
                                textLayoutModule->skipLengthCO,
-                               length, defaultUnit);
+                               length, default_unit);
                        break;
                        }
                default:
@@ -2821,6 +3170,7 @@ void GuiDocument::paramsToDialog()
 
        textLayoutModule->twoColumnCB->setChecked(
                bp_.columns == 2);
+       textLayoutModule->justCB->setChecked(bp_.justification);
 
        if (!bp_.options.empty()) {
                latexModule->optionsLE->setText(
@@ -2866,11 +3216,11 @@ void GuiDocument::paramsToDialog()
        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"));
+               docPS->showPanel("Child Documents", false);
+               if (docPS->isCurrentPanel("Child Documents"))
+                       docPS->setCurrentPanel("Document Class");
        } else {
-               docPS->showPanel(qt_("Child Documents"), true);
+               docPS->showPanel("Child Documents", true);
                masterChildModule->setEnabled(true);
                includeonlys_ = bp_.getIncludedChildren();
                updateIncludeonlys();
@@ -2887,30 +3237,19 @@ void GuiDocument::paramsToDialog()
                InsetListingsParams(bp_.listings_params).separatedParams();
        listingsModule->listingsED->setPlainText(toqstr(lstparams));
 
-       // Output
-       // update combobox with formats
-       updateDefaultFormat();
-       int index = outputModule->defaultFormatCO->findData(toqstr(
-               bp_.default_output_format));
-       // set to default if format is not found 
-       if (index == -1)
-               index = 0;
-       outputModule->defaultFormatCO->setCurrentIndex(index);
+       // Fonts
+       // some languages only work with polyglossia/XeTeX
+       Language const * lang = lyx::languages.getLanguage(
+               fromqstr(langModule->languageCO->itemData(
+                       langModule->languageCO->currentIndex()).toString()));
+       bool const need_fontspec =
+               lang->babel().empty() && !lang->polyglossia().empty();
        bool const os_fonts_available =
                bp_.baseClass()->outputType() == lyx::LATEX
                && LaTeXFeatures::isAvailable("fontspec");
-       fontModule->osFontsCB->setEnabled(os_fonts_available);
+       fontModule->osFontsCB->setEnabled(os_fonts_available && !need_fontspec);
        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
+               (os_fonts_available && bp_.useNonTeXFonts) || need_fontspec);
        updateFontsize(documentClass().opt_fontsize(),
                        bp_.fontsize);
 
@@ -2938,6 +3277,14 @@ void GuiDocument::paramsToDialog()
        }
        fontModule->fontsTypewriterCO->setCurrentIndex(tpos);
 
+       font = toqstr(bp_.fonts_math);
+       int mpos = fontModule->fontsMathCO->findData(font);
+       if (mpos == -1) {
+               mpos = fontModule->fontsMathCO->count();
+               fontModule->fontsMathCO->addItem(font + qt_(" (not installed)"), font);
+       }
+       fontModule->fontsMathCO->setCurrentIndex(mpos);
+
        if (bp_.useNonTeXFonts && os_fonts_available) {
                fontModule->fontencLA->setEnabled(false);
                fontModule->fontencCO->setEnabled(false);
@@ -2961,22 +3308,40 @@ void GuiDocument::paramsToDialog()
        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);
+       if (bp_.fontenc == "global" || bp_.fontenc == "default") {
+               fontModule->fontencCO->setCurrentIndex(
+                       fontModule->fontencCO->findData(toqstr(bp_.fontenc)));
                fontModule->fontencLE->setEnabled(false);
        } else {
                fontModule->fontencCO->setCurrentIndex(1);
                fontModule->fontencLE->setText(toqstr(bp_.fontenc));
        }
 
+       // Output
+       // This must be set _after_ fonts since updateDefaultFormat()
+       // checks osFontsCB settings.
+       // update combobox with formats
+       updateDefaultFormat();
+       int index = outputModule->defaultFormatCO->findData(toqstr(
+               bp_.default_output_format));
+       // set to default if format is not found
+       if (index == -1)
+               index = 0;
+       outputModule->defaultFormatCO->setCurrentIndex(index);
+
+       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);
+       outputModule->cssCB->setChecked(bp_.html_css_as_file);
+
        // paper
        bool const extern_geometry =
                documentClass().provides("geometry");
@@ -2996,9 +3361,9 @@ void GuiDocument::paramsToDialog()
                bp_.sides == TwoSides);
 
        lengthToWidgets(pageLayoutModule->paperwidthLE,
-               pageLayoutModule->paperwidthUnitCO, bp_.paperwidth, defaultUnit);
+               pageLayoutModule->paperwidthUnitCO, bp_.paperwidth, default_unit);
        lengthToWidgets(pageLayoutModule->paperheightLE,
-               pageLayoutModule->paperheightUnitCO, bp_.paperheight, defaultUnit);
+               pageLayoutModule->paperheightUnitCO, bp_.paperheight, default_unit);
 
        // margins
        Ui::MarginsUi * m = marginsModule;
@@ -3006,28 +3371,28 @@ void GuiDocument::paramsToDialog()
        setMargins();
 
        lengthToWidgets(m->topLE, m->topUnit,
-               bp_.topmargin, defaultUnit);
+               bp_.topmargin, default_unit);
 
        lengthToWidgets(m->bottomLE, m->bottomUnit,
-               bp_.bottommargin, defaultUnit);
+               bp_.bottommargin, default_unit);
 
        lengthToWidgets(m->innerLE, m->innerUnit,
-               bp_.leftmargin, defaultUnit);
+               bp_.leftmargin, default_unit);
 
        lengthToWidgets(m->outerLE, m->outerUnit,
-               bp_.rightmargin, defaultUnit);
+               bp_.rightmargin, default_unit);
 
        lengthToWidgets(m->headheightLE, m->headheightUnit,
-               bp_.headheight, defaultUnit);
+               bp_.headheight, default_unit);
 
        lengthToWidgets(m->headsepLE, m->headsepUnit,
-               bp_.headsep, defaultUnit);
+               bp_.headsep, default_unit);
 
        lengthToWidgets(m->footskipLE, m->footskipUnit,
-               bp_.footskip, defaultUnit);
+               bp_.footskip, default_unit);
 
        lengthToWidgets(m->columnsepLE, m->columnsepUnit,
-               bp_.columnsep, defaultUnit);
+               bp_.columnsep, default_unit);
 
        // branches
        updateUnknownBranches();
@@ -3036,6 +3401,10 @@ void GuiDocument::paramsToDialog()
        // PDF support
        PDFOptions const & pdf = bp_.pdfoptions();
        pdfSupportModule->use_hyperrefGB->setChecked(pdf.use_hyperref);
+       if (bp_.documentClass().provides("hyperref"))
+               pdfSupportModule->use_hyperrefGB->setTitle(qt_("C&ustomize Hyperref Options"));
+       else
+               pdfSupportModule->use_hyperrefGB->setTitle(qt_("&Use Hyperref Support"));
        pdfSupportModule->titleLE->setText(toqstr(pdf.title));
        pdfSupportModule->authorLE->setText(toqstr(pdf.author));
        pdfSupportModule->subjectLE->setText(toqstr(pdf.subject));
@@ -3079,26 +3448,26 @@ void GuiDocument::saveDocDefault()
 }
 
 
-void GuiDocument::updateAvailableModules() 
+void GuiDocument::updateAvailableModules()
 {
        modules_av_model_.clear();
        list<modInfoStruct> const & modInfoList = getModuleInfo();
        list<modInfoStruct>::const_iterator mit = modInfoList.begin();
        list<modInfoStruct>::const_iterator men = modInfoList.end();
        for (int i = 0; mit != men; ++mit, ++i)
-               modules_av_model_.insertRow(i, mit->name, mit->id, 
+               modules_av_model_.insertRow(i, mit->name, mit->id,
                                mit->description);
 }
 
 
-void GuiDocument::updateSelectedModules() 
+void GuiDocument::updateSelectedModules()
 {
        modules_sel_model_.clear();
        list<modInfoStruct> const selModList = getSelectedModules();
        list<modInfoStruct>::const_iterator mit = selModList.begin();
        list<modInfoStruct>::const_iterator men = selModList.end();
        for (int i = 0; mit != men; ++mit, ++i)
-               modules_sel_model_.insertRow(i, mit->name, mit->id, 
+               modules_sel_model_.insertRow(i, mit->name, mit->id,
                                mit->description);
 }
 
@@ -3170,7 +3539,7 @@ void GuiDocument::useClassDefaults()
        }
 
        int idx = latexModule->classCO->currentIndex();
-       string const classname = classes_model_.getIDString(idx);
+       string const classname = fromqstr(latexModule->classCO->getData(idx));
        if (!bp_.setBaseClass(classname)) {
                Alert::error(_("Error"), _("Unable to set document class."));
                return;
@@ -3182,33 +3551,30 @@ void GuiDocument::useClassDefaults()
 
 void GuiDocument::setLayoutComboByIDString(string const & idString)
 {
-       int idx = classes_model_.findIDString(idString);
-       if (idx < 0)
-               Alert::warning(_("Can't set layout!"), 
+       if (!latexModule->classCO->set(toqstr(idString)))
+               Alert::warning(_("Can't set layout!"),
                        bformat(_("Unable to set layout for ID: %1$s"), from_utf8(idString)));
-       else 
-               latexModule->classCO->setCurrentIndex(idx);
 }
 
 
 bool GuiDocument::isValid()
 {
-       return 
+       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 || 
+                       textLayoutModule->skipCO->currentIndex() != 3 ||
                        // or else a length has been given
                        !textLayoutModule->skipLE->text().isEmpty()
-               ) && 
+               ) &&
                (
                        // if we're asking for indentation
-                       !textLayoutModule->indentRB->isChecked() || 
+                       !textLayoutModule->indentRB->isChecked() ||
                        // then either we haven't chosen custom
-                       textLayoutModule->indentCO->currentIndex() != 1 || 
+                       textLayoutModule->indentCO->currentIndex() != 1 ||
                        // or else a length has been given
                        !textLayoutModule->indentLE->text().isEmpty()
                );
@@ -3264,7 +3630,7 @@ list<GuiDocument::modInfoStruct> const & GuiDocument::getModuleInfo()
 }
 
 
-list<GuiDocument::modInfoStruct> const 
+list<GuiDocument::modInfoStruct> const
                GuiDocument::makeModuleInfo(LayoutModuleList const & mods)
 {
        LayoutModuleList::const_iterator it =  mods.begin();
@@ -3277,7 +3643,7 @@ list<GuiDocument::modInfoStruct> const
                if (mod)
                        // FIXME Unicode
                        m.name = toqstr(translateIfPossible(from_utf8(mod->getName())));
-               else 
+               else
                        m.name = toqstr(*it) + toqstr(" (") + qt_("Not Found") + toqstr(")");
                mInfo.push_back(m);
        }
@@ -3316,6 +3682,11 @@ static void dispatch_bufferparams(Dialog const & dialog,
 
 void GuiDocument::dispatchParams()
 {
+       // We need a non-const buffer object.
+       Buffer & buf = const_cast<BufferView *>(bufferview())->buffer();
+       // There may be several undo records; group them (bug #8998)
+       buf.undo().beginUndoGroup();
+
        // This must come first so that a language change is correctly noticed
        setLanguage();
 
@@ -3332,12 +3703,12 @@ void GuiDocument::dispatchParams()
                                if (master->isChild(const_cast<Buffer *>(&buffer())))
                                        const_cast<Buffer &>(buffer()).setParent(master);
                                else
-                                       Alert::warning(_("Assigned master does not include this file"), 
+                                       Alert::warning(_("Assigned master does not include this file"),
                                                bformat(_("You must include this file in the document\n"
                                                          "'%1$s' in order to use the master document\n"
                                                          "feature."), from_utf8(params().master)));
                        } else
-                               Alert::warning(_("Could not load master"), 
+                               Alert::warning(_("Could not load master"),
                                                bformat(_("The master document '%1$s'\n"
                                                           "could not be loaded."),
                                                           from_utf8(params().master)));
@@ -3366,7 +3737,7 @@ void GuiDocument::dispatchParams()
        executeBranchRenaming();
        // and clear changed branches cache
        changedBranches_.clear();
-       
+
        // Generate the colours requested by indices.
        IndicesList & indiceslist = params().indiceslist();
        if (!indiceslist.empty()) {
@@ -3385,6 +3756,10 @@ void GuiDocument::dispatchParams()
        // If we used an LFUN, we would not need these two lines:
        BufferView * bv = const_cast<BufferView *>(bufferview());
        bv->processUpdateFlags(Update::Force | Update::FitCursor);
+
+       // Don't forget to close the group. Note that it is important
+       // to check that there is no early return in the method.
+       buf.undo().endUndoGroup();
 }
 
 
@@ -3405,61 +3780,59 @@ void GuiDocument::saveAsDefault() const
 }
 
 
-bool GuiDocument::isFontAvailable(string const & font) const
+bool GuiDocument::providesOSF(QString const & font) const
 {
-       if (font == "default" || font == "cmr"
-           || font == "cmss" || font == "cmtt")
-               // these are standard
+       if (fontModule->osFontsCB->isChecked())
+               // FIXME: we should check if the fonts really
+               // have OSF support. But how?
                return true;
-       if (font == "lmodern" || font == "lmss" || font == "lmtt")
-               return LaTeXFeatures::isAvailable("lmodern");
-       if (font == "times" || font == "palatino"
-                || font == "helvet" || font == "courier")
-               return LaTeXFeatures::isAvailable("psnfss");
-       if (font == "cmbr" || font == "cmtl")
-               return LaTeXFeatures::isAvailable("cmbright");
-       if (font == "utopia")
-               return LaTeXFeatures::isAvailable("utopia")
-                       || LaTeXFeatures::isAvailable("fourier");
-       if (font == "beraserif" || font == "berasans"
-               || font == "beramono")
-               return LaTeXFeatures::isAvailable("bera");
-       return LaTeXFeatures::isAvailable(font);
+       return theLaTeXFonts().getLaTeXFont(
+                               qstring_to_ucs4(font)).providesOSF(ot1(),
+                                                                  completeFontset(),
+                                                                  noMathFont());
 }
 
 
-bool GuiDocument::providesOSF(string const & font) const
+bool GuiDocument::providesSC(QString const & font) const
+{
+       if (fontModule->osFontsCB->isChecked())
+               return false;
+       return theLaTeXFonts().getLaTeXFont(
+                               qstring_to_ucs4(font)).providesSC(ot1(),
+                                                                 completeFontset(),
+                                                                 noMathFont());
+}
+
+
+bool GuiDocument::providesScale(QString const & font) const
 {
        if (fontModule->osFontsCB->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")
-               return isFontAvailable("mathpazo");
-       return false;
+       return theLaTeXFonts().getLaTeXFont(
+                               qstring_to_ucs4(font)).providesScale(ot1(),
+                                                                    completeFontset(),
+                                                                    noMathFont());
 }
 
 
-bool GuiDocument::providesSC(string const & font) const
+bool GuiDocument::providesNoMath(QString const & font) const
 {
        if (fontModule->osFontsCB->isChecked())
                return false;
-       if (font == "palatino")
-               return isFontAvailable("mathpazo");
-       if (font == "utopia")
-               return isFontAvailable("fourier");
-       return false;
+       return theLaTeXFonts().getLaTeXFont(
+                               qstring_to_ucs4(font)).providesNoMath(ot1(),
+                                                                     completeFontset());
 }
 
 
-bool GuiDocument::providesScale(string const & font) const
+bool GuiDocument::hasMonolithicExpertSet(QString const & font) const
 {
        if (fontModule->osFontsCB->isChecked())
-               return true;
-       return font == "helvet" || font == "luximono"
-               || font == "berasans"  || font == "beramono";
+               return false;
+       return theLaTeXFonts().getLaTeXFont(
+                               qstring_to_ucs4(font)).hasMonolithicExpertSet(ot1(),
+                                                                             completeFontset(),
+                                                                             noMathFont());
 }
 
 
@@ -3481,7 +3854,8 @@ void GuiDocument::loadModuleInfo()
                if (pos > 0)
                        desc.truncate(pos + 1);
                m.description = desc;
-               moduleNames_.push_back(m);
+               if (it->category().substr(0, 8) != "Citation")
+                       moduleNames_.push_back(m);
        }
 }
 
@@ -3527,6 +3901,33 @@ void GuiDocument::executeBranchRenaming() const
 }
 
 
+void GuiDocument::allPackagesAuto()
+{
+       allPackages(1);
+}
+
+
+void GuiDocument::allPackagesAlways()
+{
+       allPackages(2);
+}
+
+
+void GuiDocument::allPackagesNot()
+{
+       allPackages(3);
+}
+
+
+void GuiDocument::allPackages(int col)
+{
+       for (int row = 0; row < mathsModule->packagesTW->rowCount(); ++row) {
+               QRadioButton * rb = (QRadioButton*)mathsModule->packagesTW->cellWidget(row, col);
+               rb->setChecked(true);
+       }
+}
+
+
 Dialog * createGuiDocument(GuiView & lv) { return new GuiDocument(lv); }