* beamer.layout:
* powerdot.layout:
- those provide geometry
* BufferParams.cpp:
* GuiDocument.cpp:
- implement provides("geometry")
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@28957
a592a061-630c-0410-9148-
cb99ea01b6c8
TocDepth 2
DefaultStyle Standard
Provides hyperref 1
TocDepth 2
DefaultStyle Standard
Provides hyperref 1
Sides 1
Provides url 1
Provides hyperref 1
Sides 1
Provides url 1
Provides hyperref 1
DefaultStyle Standard
DefaultFont
DefaultStyle Standard
DefaultFont
os << "}\n";
texrow.newline();
}
os << "}\n";
texrow.newline();
}
- if (use_geometry || nonstandard_papersize) {
+ if (!tclass.provides("geometry")
+ && (use_geometry || nonstandard_papersize)) {
odocstringstream ods;
if (!getGraphicsDriver("geometry").empty())
ods << getGraphicsDriver("geometry");
odocstringstream ods;
if (!getGraphicsDriver("geometry").empty())
ods << getGraphicsDriver("geometry");
void GuiDocument::setMargins(bool custom)
{
void GuiDocument::setMargins(bool custom)
{
+ bool const extern_geometry =
+ documentClass().provides("geometry");
+ marginsModule->marginCB->setEnabled(!extern_geometry);
+ if (extern_geometry) {
+ marginsModule->marginCB->setChecked(false);
+ setCustomMargins(true);
+ return;
+ }
marginsModule->marginCB->setChecked(custom);
setCustomMargins(custom);
}
marginsModule->marginCB->setChecked(custom);
setCustomMargins(custom);
}
fontModule->fontsDefaultCO->setCurrentIndex(n);
// paper
fontModule->fontsDefaultCO->setCurrentIndex(n);
// paper
+ bool const extern_geometry =
+ documentClass().provides("geometry");
int const psize = bp_.papersize;
pageLayoutModule->papersizeCO->setCurrentIndex(psize);
int const psize = bp_.papersize;
pageLayoutModule->papersizeCO->setCurrentIndex(psize);
- setCustomPapersize(psize);
+ setCustomPapersize(!extern_geometry && psize);
+ pageLayoutModule->papersizeCO->setEnabled(!extern_geometry);
bool const landscape =
bp_.orientation == ORIENTATION_LANDSCAPE;
pageLayoutModule->landscapeRB->setChecked(landscape);
pageLayoutModule->portraitRB->setChecked(!landscape);
bool const landscape =
bp_.orientation == ORIENTATION_LANDSCAPE;
pageLayoutModule->landscapeRB->setChecked(landscape);
pageLayoutModule->portraitRB->setChecked(!landscape);
+ pageLayoutModule->landscapeRB->setEnabled(!extern_geometry);
+ pageLayoutModule->portraitRB->setEnabled(!extern_geometry);
pageLayoutModule->facingPagesCB->setChecked(
bp_.sides == TwoSides);
pageLayoutModule->facingPagesCB->setChecked(
bp_.sides == TwoSides);