Jürgen,
when updating my tree with the font patch I got conflicts. I guess that
the removal of the paper options was not done on purpose? If that was an
accident, I am going to put the attached patch in.
Georg
Index: src/frontends/qt3/QDocument.C
===================================================================
--- src/frontends/qt3/QDocument.C (Revision 14175)
+++ src/frontends/qt3/QDocument.C (Arbeitskopie)
@@ -688,6 +688,11 @@ void QDocument::update_contents()
if (n >= 0)
dialog_->fontModule->fontsDefaultCO->setCurrentItem(n);
+ // paper
+ int const psize = params.papersize;
+ dialog_->pageLayoutModule->papersizeCO->setCurrentItem(psize);
+ dialog_->setCustomPapersize(psize);
+
// margins
MarginsModuleBase * m = dialog_->marginsModule;
Index: src/frontends/xforms/FormDocument.C
===================================================================
--- src/frontends/xforms/FormDocument.C (Revision 14175)
+++ src/frontends/xforms/FormDocument.C (Arbeitskopie)
@@ -60,7 +60,7 @@ namespace lyx {
using support::bformat;
using support::contains;
-using lyx::support::findToken;
+using support::findToken;
using support::getStringFromVector;
using support::getVectorFromString;
using support::libFileSearch;
Index: src/frontends/controllers/ControlDocument.C
===================================================================
--- src/frontends/controllers/ControlDocument.C (Revision 14175)
+++ src/frontends/controllers/ControlDocument.C (Arbeitskopie)
@@ -41,7 +41,7 @@ char const * const ControlDocument::font
char const * ControlDocument::fontfamilies_gui[5] = {
- N_("Default"), N_("Roman"), N_("Sans Serif"), N_("Typewriter"), ""
+ N_("default"), N_("roman"), N_("sans serif"), N_("typewriter"), ""
};
