X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiDocument.cpp;h=97f79af9ce9545354f671d7c9a6a38a55010e5f2;hb=53250a12694c2f0f671c17f868e8135d60e9af6f;hp=21a3e8f5c2ea930be00395569374939dd2ed4d46;hpb=62ca7f3ae55ad2e0c395cb554d71afab87de1ee3;p=lyx.git
diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index 21a3e8f5c2..97f79af9ce 100644
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -46,6 +46,7 @@
#include "PDFOptions.h"
#include "qt_helpers.h"
#include "Spacing.h"
+#include "TextClass.h"
#include "insets/InsetListingsParams.h"
@@ -525,6 +526,82 @@ void PreambleModule::closeEvent(QCloseEvent * e)
}
+/////////////////////////////////////////////////////////////////////
+//
+// LocalLayout
+//
+/////////////////////////////////////////////////////////////////////
+
+
+LocalLayout::LocalLayout() : current_id_(0), is_valid_(false)
+{
+ connect(locallayoutTE, SIGNAL(textChanged()), this, SLOT(textChanged()));
+ connect(validatePB, SIGNAL(clicked()), this, SLOT(validatePressed()));
+}
+
+
+void LocalLayout::update(BufferParams const & params, BufferId id)
+{
+ QString layout = toqstr(params.local_layout);
+ // Nothing to do if the params and preamble are unchanged.
+ if (id == current_id_
+ && layout == locallayoutTE->document()->toPlainText())
+ return;
+
+ // Save the params address for further use.
+ current_id_ = id;
+ locallayoutTE->document()->setPlainText(layout);
+ validate();
+}
+
+
+void LocalLayout::apply(BufferParams & params)
+{
+ string const layout = fromqstr(locallayoutTE->document()->toPlainText());
+ params.local_layout = layout;
+}
+
+
+void LocalLayout::textChanged()
+{
+ static const QString unknown = qt_("Press button to check validity...");
+
+ is_valid_ = false;
+ infoLB->setText(unknown);
+ validatePB->setEnabled(true);
+ changed();
+}
+
+
+void LocalLayout::validate() {
+ static const QString valid = qt_("Layout is valid!");
+ static const QString vtext =
+ toqstr("
")
+ + valid + toqstr("
");
+ static const QString invalid = qt_("Layout is invalid!");
+ static const QString ivtext =
+ toqstr("")
+ + invalid + toqstr("
");
+
+ string const layout =
+ fromqstr(locallayoutTE->document()->toPlainText().trimmed());
+ if (layout.empty()) {
+ is_valid_ = true;
+ infoLB->setText("");
+ } else {
+ is_valid_ = TextClass::validate(layout);
+ infoLB->setText(is_valid_ ? vtext : ivtext);
+ }
+ validatePB->setEnabled(false);
+}
+
+
+void LocalLayout::validatePressed() {
+ validate();
+ changed();
+}
+
+
/////////////////////////////////////////////////////////////////////
//
// DocumentDialog
@@ -649,16 +726,30 @@ GuiDocument::GuiDocument(GuiView & lv)
// output
outputModule = new UiWidget;
- connect(outputModule->xetexCB, SIGNAL(clicked()),
- this, SLOT(change_adaptor()));
- connect(outputModule->xetexCB, SIGNAL(toggled(bool)),
- this, SLOT(xetexChanged(bool)));
connect(outputModule->defaultFormatCO, SIGNAL(activated(int)),
this, SLOT(change_adaptor()));
+ connect(outputModule->mathimgSB, SIGNAL(valueChanged(double)),
+ this, SLOT(change_adaptor()));
+ connect(outputModule->strictCB, SIGNAL(stateChanged(int)),
+ this, SLOT(change_adaptor()));
+ connect(outputModule->mathoutCB, SIGNAL(currentIndexChanged(int)),
+ this, SLOT(change_adaptor()));
+ connect(outputModule->outputsyncCB, SIGNAL(clicked()),
+ this, SLOT(change_adaptor()));
+ connect(outputModule->synccustomCB, SIGNAL(editTextChanged(QString)),
+ this, SLOT(change_adaptor()));
+ outputModule->synccustomCB->addItem("");
+ outputModule->synccustomCB->addItem("\\synctex=1");
+ outputModule->synccustomCB->addItem("\\synctex=-1");
+ outputModule->synccustomCB->addItem("\\usepackage[active]{srcltx}");
// fonts
fontModule = new UiWidget;
+ connect(fontModule->osFontsCB, SIGNAL(clicked()),
+ this, SLOT(change_adaptor()));
+ connect(fontModule->osFontsCB, SIGNAL(toggled(bool)),
+ this, SLOT(osFontsChanged(bool)));
connect(fontModule->fontsRomanCO, SIGNAL(activated(int)),
this, SLOT(change_adaptor()));
connect(fontModule->fontsRomanCO, SIGNAL(activated(int)),
@@ -715,7 +806,7 @@ GuiDocument::GuiDocument(GuiView & lv)
connect(pageLayoutModule->papersizeCO, SIGNAL(activated(int)),
this, SLOT(papersizeChanged(int)));
connect(pageLayoutModule->portraitRB, SIGNAL(clicked()),
- this, SLOT(portraitChanged()));
+ this, SLOT(change_adaptor()));
connect(pageLayoutModule->papersizeCO, SIGNAL(activated(int)),
this, SLOT(change_adaptor()));
connect(pageLayoutModule->paperheightLE, SIGNAL(textChanged(const QString &)),
@@ -751,12 +842,34 @@ GuiDocument::GuiDocument(GuiView & lv)
cb->addItem(qt_("US letter"));
cb->addItem(qt_("US legal"));
cb->addItem(qt_("US executive"));
+ cb->addItem(qt_("A0"));
+ cb->addItem(qt_("A1"));
+ cb->addItem(qt_("A2"));
cb->addItem(qt_("A3"));
cb->addItem(qt_("A4"));
cb->addItem(qt_("A5"));
+ cb->addItem(qt_("A6"));
+ cb->addItem(qt_("B0"));
+ cb->addItem(qt_("B1"));
+ cb->addItem(qt_("B2"));
cb->addItem(qt_("B3"));
cb->addItem(qt_("B4"));
cb->addItem(qt_("B5"));
+ cb->addItem(qt_("B6"));
+ cb->addItem(qt_("C0"));
+ cb->addItem(qt_("C1"));
+ cb->addItem(qt_("C2"));
+ cb->addItem(qt_("C3"));
+ cb->addItem(qt_("C4"));
+ cb->addItem(qt_("C5"));
+ cb->addItem(qt_("C6"));
+ cb->addItem(qt_("JIS B0"));
+ cb->addItem(qt_("JIS B1"));
+ cb->addItem(qt_("JIS B2"));
+ cb->addItem(qt_("JIS B3"));
+ cb->addItem(qt_("JIS B4"));
+ cb->addItem(qt_("JIS B5"));
+ cb->addItem(qt_("JIS B6"));
// remove the %-items from the unit choice
pageLayoutModule->paperwidthUnitCO->noPercents();
pageLayoutModule->paperheightUnitCO->noPercents();
@@ -960,6 +1073,8 @@ GuiDocument::GuiDocument(GuiView & lv)
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()));
@@ -973,7 +1088,11 @@ GuiDocument::GuiDocument(GuiView & lv)
this, SLOT(change_adaptor()));
connect(mathsModule->mhchemautoCB, SIGNAL(clicked()),
this, SLOT(change_adaptor()));
-
+ connect(mathsModule->mathdotsCB, SIGNAL(clicked()),
+ this, SLOT(change_adaptor()));
+ connect(mathsModule->mathdotsautoCB, SIGNAL(clicked()),
+ this, SLOT(change_adaptor()));
+
// latex class
latexModule = new UiWidget;
@@ -999,6 +1118,8 @@ GuiDocument::GuiDocument(GuiView & lv)
this, SLOT(browseMaster()));
connect(latexModule->suppressDateCB, SIGNAL(clicked()),
this, SLOT(change_adaptor()));
+ connect(latexModule->refstyleCB, SIGNAL(clicked()),
+ this, SLOT(change_adaptor()));
// postscript drivers
for (int n = 0; tex_graphics[n][0]; ++n) {
@@ -1035,6 +1156,10 @@ 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()));
// bullets
@@ -1123,6 +1248,7 @@ GuiDocument::GuiDocument(GuiView & lv)
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"));
@@ -1149,12 +1275,6 @@ GuiDocument::GuiDocument(GuiView & lv)
}
-void GuiDocument::showPreamble()
-{
- docPS->setCurrentPanel(qt_("LaTeX Preamble"));
-}
-
-
void GuiDocument::saveDefaultClicked()
{
saveDocDefault();
@@ -1276,13 +1396,7 @@ void GuiDocument::enableSkip(bool skip)
}
-void GuiDocument::portraitChanged()
-{
- setMargins(pageLayoutModule->papersizeCO->currentIndex());
-}
-
-
-void GuiDocument::setMargins(bool custom)
+void GuiDocument::setMargins()
{
bool const extern_geometry =
documentClass().provides("geometry");
@@ -1290,10 +1404,10 @@ void GuiDocument::setMargins(bool custom)
if (extern_geometry) {
marginsModule->marginCB->setChecked(false);
setCustomMargins(true);
- return;
+ } else {
+ marginsModule->marginCB->setChecked(!bp_.use_geometry);
+ setCustomMargins(!bp_.use_geometry);
}
- marginsModule->marginCB->setChecked(custom);
- setCustomMargins(custom);
}
@@ -1471,38 +1585,42 @@ void GuiDocument::deleteBoxBackgroundColor()
}
-void GuiDocument::xetexChanged(bool xetex)
+void GuiDocument::osFontsChanged(bool nontexfonts)
{
+ bool const tex_fonts = !nontexfonts;
updateFontlist();
updateDefaultFormat();
- langModule->encodingCO->setEnabled(!xetex &&
+ langModule->encodingCO->setEnabled(tex_fonts &&
!langModule->defaultencodingRB->isChecked());
- langModule->defaultencodingRB->setEnabled(!xetex);
- langModule->otherencodingRB->setEnabled(!xetex);
+ langModule->defaultencodingRB->setEnabled(tex_fonts);
+ langModule->otherencodingRB->setEnabled(tex_fonts);
- fontModule->fontsDefaultCO->setEnabled(!xetex);
- fontModule->fontsDefaultLA->setEnabled(!xetex);
- fontModule->cjkFontLE->setEnabled(!xetex);
- fontModule->cjkFontLA->setEnabled(!xetex);
+ fontModule->fontsDefaultCO->setEnabled(tex_fonts);
+ fontModule->fontsDefaultLA->setEnabled(tex_fonts);
+ fontModule->cjkFontLE->setEnabled(tex_fonts);
+ fontModule->cjkFontLA->setEnabled(tex_fonts);
string font;
- if (!xetex)
+ if (tex_fonts)
font = tex_fonts_sans[fontModule->fontsSansCO->currentIndex()];
bool scaleable = providesScale(font);
fontModule->scaleSansSB->setEnabled(scaleable);
fontModule->scaleSansLA->setEnabled(scaleable);
- if (!xetex)
+ if (tex_fonts)
font = tex_fonts_monospaced[fontModule->fontsTypewriterCO->currentIndex()];
scaleable = providesScale(font);
fontModule->scaleTypewriterSB->setEnabled(scaleable);
fontModule->scaleTypewriterLA->setEnabled(scaleable);
- if (!xetex)
+ if (tex_fonts)
font = tex_fonts_roman[fontModule->fontsRomanCO->currentIndex()];
fontModule->fontScCB->setEnabled(providesSC(font));
fontModule->fontOsfCB->setEnabled(providesOSF(font));
- fontModule->fontencLA->setEnabled(!xetex);
- fontModule->fontencCO->setEnabled(!xetex);
- fontModule->fontencLE->setEnabled(!xetex);
+ fontModule->fontencLA->setEnabled(tex_fonts);
+ fontModule->fontencCO->setEnabled(tex_fonts);
+ if (!tex_fonts)
+ fontModule->fontencLE->setEnabled(false);
+ else
+ fontencChanged(fontModule->fontencCO->currentIndex());
}
@@ -1531,7 +1649,7 @@ void GuiDocument::updateFontlist()
fontModule->fontsTypewriterCO->clear();
// With XeTeX, we have access to all system fonts, but not the LaTeX fonts
- if (outputModule->xetexCB->isChecked()) {
+ if (fontModule->osFontsCB->isChecked()) {
fontModule->fontsRomanCO->addItem(qt_("Default"));
fontModule->fontsSansCO->addItem(qt_("Default"));
fontModule->fontsTypewriterCO->addItem(qt_("Default"));
@@ -1575,7 +1693,7 @@ void GuiDocument::fontencChanged(int item)
void GuiDocument::romanChanged(int item)
{
- if (outputModule->xetexCB->isChecked())
+ if (fontModule->osFontsCB->isChecked())
return;
string const font = tex_fonts_roman[item];
fontModule->fontScCB->setEnabled(providesSC(font));
@@ -1585,7 +1703,7 @@ void GuiDocument::romanChanged(int item)
void GuiDocument::sansChanged(int item)
{
- if (outputModule->xetexCB->isChecked())
+ if (fontModule->osFontsCB->isChecked())
return;
string const font = tex_fonts_sans[item];
bool scaleable = providesScale(font);
@@ -1596,7 +1714,7 @@ void GuiDocument::sansChanged(int item)
void GuiDocument::ttChanged(int item)
{
- if (outputModule->xetexCB->isChecked())
+ if (fontModule->osFontsCB->isChecked())
return;
string const font = tex_fonts_monospaced[item];
bool scaleable = providesScale(font);
@@ -1639,7 +1757,7 @@ void GuiDocument::browseLayout()
QString const label1 = qt_("Layouts|#o#O");
QString const dir1 = toqstr(lyxrc.document_path);
QStringList const filter(qt_("LyX Layout (*.layout)"));
- QString file = browseRelFile(QString(), bufferFilepath(),
+ QString file = browseRelFile(QString(), bufferFilePath(),
qt_("Local layout file"), filter, false,
label1, dir1);
@@ -1647,7 +1765,7 @@ void GuiDocument::browseLayout()
return;
FileName layoutFile = support::makeAbsPath(fromqstr(file),
- fromqstr(bufferFilepath()));
+ fromqstr(bufferFilePath()));
int const ret = Alert::prompt(_("Local layout file"),
_("The layout file you have selected is a local layout\n"
@@ -1767,6 +1885,9 @@ void GuiDocument::bibtexChanged(int n)
namespace {
+ // FIXME unicode
+ // both of these should take a vector
+
// This is an insanely complicated attempt to make this sort of thing
// work with RTL languages.
docstring formatStrVec(vector const & v, docstring const & s)
@@ -1775,22 +1896,24 @@ namespace {
if (v.size() == 0)
return docstring();
if (v.size() == 1)
- return from_utf8(v[0]);
+ return translateIfPossible(from_utf8(v[0]));
if (v.size() == 2) {
docstring retval = _("%1$s and %2$s");
retval = subst(retval, _("and"), s);
- return bformat(retval, from_utf8(v[0]), from_utf8(v[1]));
+ return bformat(retval, translateIfPossible(from_utf8(v[0])),
+ translateIfPossible(from_utf8(v[1])));
}
// The idea here is to format all but the last two items...
int const vSize = v.size();
docstring t2 = _("%1$s, %2$s");
- docstring retval = from_utf8(v[0]);
+ docstring retval = translateIfPossible(from_utf8(v[0]));
for (int i = 1; i < vSize - 2; ++i)
- retval = bformat(t2, retval, from_utf8(v[i]));
+ retval = bformat(t2, retval, translateIfPossible(from_utf8(v[i])));
//...and then to plug them, and the last two, into this schema
docstring t = _("%1$s, %2$s, and %3$s");
t = subst(t, _("and"), s);
- return bformat(t, retval, from_utf8(v[vSize - 2]), from_utf8(v[vSize - 1]));
+ return bformat(t, retval, translateIfPossible(from_utf8(v[vSize - 2])),
+ translateIfPossible(from_utf8(v[vSize - 1])));
}
vector idsToNames(vector const & idList)
@@ -1801,13 +1924,14 @@ namespace {
for (; it != end; ++it) {
LyXModule const * const mod = theModuleList[*it];
if (!mod)
- retval.push_back(*it + " (Unavailable)");
+ retval.push_back(to_utf8(bformat(_("%1$s (unavailable)"),
+ translateIfPossible(from_utf8(*it)))));
else
retval.push_back(mod->getName());
}
return retval;
}
-}
+} // end anonymous namespace
void GuiDocument::modulesToParams(BufferParams & bp)
@@ -1892,7 +2016,7 @@ void GuiDocument::updateModuleInfo()
pkgdesc = formatStrVec(reqdescs, _("or"));
if (!desc.empty())
desc += "\n";
- desc += bformat(_("Module required: %1$s."), pkgdesc);
+ desc += bformat(_("Modules required: %1$s."), pkgdesc);
}
pkglist = getExcludedList(modName);
@@ -1950,7 +2074,8 @@ void GuiDocument::updateDefaultFormat()
return;
// make a copy in order to consider unapplied changes
Buffer * tmpbuf = buffer().clone();
- tmpbuf->params().useXetex = outputModule->xetexCB->isChecked();
+ tmpbuf->params().useNonTeXFonts =
+ fontModule->osFontsCB->isChecked();
int idx = latexModule->classCO->currentIndex();
if (idx >= 0) {
string const classname = classes_model_.getIDString(idx);
@@ -1987,9 +2112,11 @@ void GuiDocument::applyView()
{
// preamble
preambleModule->apply(bp_);
+ localLayout->apply(bp_);
// date
bp_.suppress_date = latexModule->suppressDateCB->isChecked();
+ bp_.use_refstyle = latexModule->refstyleCB->isChecked();
// biblio
bp_.setCiteEngine(ENGINE_BASIC);
@@ -2097,7 +2224,7 @@ void GuiDocument::applyView()
bp_.user_defined_bullet(3) = bulletsModule->bullet(3);
// packages
- bp_.graphicsDriver =
+ bp_.graphics_driver =
tex_graphics[latexModule->psdriverCO->currentIndex()];
// text layout
@@ -2111,9 +2238,9 @@ void GuiDocument::applyView()
modulesToParams(bp_);
// Math
- if (mathsModule->amsautoCB->isChecked()) {
+ if (mathsModule->amsautoCB->isChecked())
bp_.use_amsmath = BufferParams::package_auto;
- } else {
+ else {
if (mathsModule->amsCB->isChecked())
bp_.use_amsmath = BufferParams::package_on;
else
@@ -2135,7 +2262,15 @@ void GuiDocument::applyView()
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;
+ }
+
// Page Layout
if (pageLayoutModule->pagestyleCO->currentIndex() == 0)
bp_.pagestyle = "default";
@@ -2157,10 +2292,14 @@ void GuiDocument::applyView()
case 2:
bp_.spacing().set(Spacing::Double);
break;
- case 3:
- bp_.spacing().set(Spacing::Other,
- widgetToDoubleStr(textLayoutModule->lspacingLE));
+ case 3: {
+ string s = widgetToDoubleStr(textLayoutModule->lspacingLE);
+ if (s.empty())
+ bp_.spacing().set(Spacing::Single);
+ else
+ bp_.spacing().set(Spacing::Other, s);
break;
+ }
}
if (textLayoutModule->twoColumnCB->isChecked())
@@ -2249,39 +2388,51 @@ void GuiDocument::applyView()
InsetListingsParams(fromqstr(listingsModule->listingsED->toPlainText())).params();
// output
- bp_.defaultOutputFormat = fromqstr(outputModule->defaultFormatCO->itemData(
+ bp_.default_output_format = fromqstr(outputModule->defaultFormatCO->itemData(
outputModule->defaultFormatCO->currentIndex()).toString());
- bool const xetex = outputModule->xetexCB->isChecked();
- bp_.useXetex = xetex;
+ bool const nontexfonts = fontModule->osFontsCB->isChecked();
+ bp_.useNonTeXFonts = nontexfonts;
+
+ bp_.output_sync = outputModule->outputsyncCB->isChecked();
+ bp_.output_sync_macro = fromqstr(outputModule->synccustomCB->currentText());
+
+ int mathfmt = outputModule->mathoutCB->currentIndex();
+ if (mathfmt == -1)
+ mathfmt = 0;
+ BufferParams::MathOutput const mo =
+ static_cast(mathfmt);
+ bp_.html_math_output = mo;
+ bp_.html_be_strict = outputModule->strictCB->isChecked();
+ bp_.html_math_img_scale = outputModule->mathimgSB->value();
// fonts
- if (xetex) {
+ if (nontexfonts) {
if (fontModule->fontsRomanCO->currentIndex() == 0)
- bp_.fontsRoman = "default";
+ bp_.fonts_roman = "default";
else
- bp_.fontsRoman =
+ bp_.fonts_roman =
fromqstr(fontModule->fontsRomanCO->currentText());
if (fontModule->fontsSansCO->currentIndex() == 0)
- bp_.fontsSans = "default";
+ bp_.fonts_sans = "default";
else
- bp_.fontsSans =
+ bp_.fonts_sans =
fromqstr(fontModule->fontsSansCO->currentText());
if (fontModule->fontsTypewriterCO->currentIndex() == 0)
- bp_.fontsTypewriter = "default";
+ bp_.fonts_typewriter = "default";
else
- bp_.fontsTypewriter =
+ bp_.fonts_typewriter =
fromqstr(fontModule->fontsTypewriterCO->currentText());
} else {
- bp_.fontsRoman =
+ bp_.fonts_roman =
tex_fonts_roman[fontModule->fontsRomanCO->currentIndex()];
- bp_.fontsSans =
+ bp_.fonts_sans =
tex_fonts_sans[fontModule->fontsSansCO->currentIndex()];
- bp_.fontsTypewriter =
+ bp_.fonts_typewriter =
tex_fonts_monospaced[fontModule->fontsTypewriterCO->currentIndex()];
}
@@ -2292,21 +2443,21 @@ void GuiDocument::applyView()
else if (fontModule->fontencCO->currentIndex() == 2)
bp_.fontenc = "default";
- bp_.fontsCJK =
+ bp_.fonts_cjk =
fromqstr(fontModule->cjkFontLE->text());
- bp_.fontsSansScale = fontModule->scaleSansSB->value();
+ bp_.fonts_sans_scale = fontModule->scaleSansSB->value();
- bp_.fontsTypewriterScale = fontModule->scaleTypewriterSB->value();
+ bp_.fonts_typewriter_scale = fontModule->scaleTypewriterSB->value();
- bp_.fontsSC = fontModule->fontScCB->isChecked();
+ bp_.fonts_expert_sc = fontModule->fontScCB->isChecked();
- bp_.fontsOSF = fontModule->fontOsfCB->isChecked();
+ bp_.fonts_old_figures = fontModule->fontOsfCB->isChecked();
- if (xetex)
- bp_.fontsDefaultFamily = "default";
+ if (nontexfonts)
+ bp_.fonts_default_family = "default";
else
- bp_.fontsDefaultFamily = GuiDocument::fontfamilies[
+ bp_.fonts_default_family = GuiDocument::fontfamilies[
fontModule->fontsDefaultCO->currentIndex()];
if (fontModule->fontsizeCO->currentIndex() == 0)
@@ -2319,10 +2470,6 @@ void GuiDocument::applyView()
bp_.papersize = PAPER_SIZE(
pageLayoutModule->papersizeCO->currentIndex());
- // custom, A3, B3 and B4 paper sizes need geometry
- int psize = pageLayoutModule->papersizeCO->currentIndex();
- bool geom_papersize = (psize == 1 || psize == 5 || psize == 8 || psize == 9);
-
bp_.paperwidth = widgetsToLength(pageLayoutModule->paperwidthLE,
pageLayoutModule->paperwidthUnitCO);
@@ -2340,8 +2487,7 @@ void GuiDocument::applyView()
bp_.orientation = ORIENTATION_PORTRAIT;
// margins
- bp_.use_geometry = !marginsModule->marginCB->isChecked()
- || geom_papersize;
+ bp_.use_geometry = !marginsModule->marginCB->isChecked();
Ui::MarginsUi const * m = marginsModule;
@@ -2392,9 +2538,11 @@ void GuiDocument::paramsToDialog()
// preamble
preambleModule->update(bp_, id());
+ localLayout->update(bp_, id());
// date
latexModule->suppressDateCB->setChecked(bp_.suppress_date);
+ latexModule->refstyleCB->setChecked(bp_.use_refstyle);
// biblio
biblioModule->citeDefaultRB->setChecked(
@@ -2514,7 +2662,7 @@ void GuiDocument::paramsToDialog()
bulletsModule->init();
// packages
- int nitem = findToken(tex_graphics, bp_.graphicsDriver);
+ int nitem = findToken(tex_graphics, bp_.graphics_driver);
if (nitem >= 0)
latexModule->psdriverCO->setCurrentIndex(nitem);
updateModuleInfo();
@@ -2534,6 +2682,11 @@ void GuiDocument::paramsToDialog()
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);
+
switch (bp_.spacing().getSpace()) {
case Spacing::Other: nitem = 3; break;
case Spacing::Double: nitem = 2; break;
@@ -2641,10 +2794,7 @@ void GuiDocument::paramsToDialog()
}
// Master/Child
- std::vector children;
- if (bufferview())
- children = buffer().getChildren(false);
- if (children.empty()) {
+ if (!bufferview() || !buffer().hasChildren()) {
masterChildModule->childrenTW->clear();
includeonlys_.clear();
docPS->showPanel(qt_("Child Documents"), false);
@@ -2672,86 +2822,95 @@ void GuiDocument::paramsToDialog()
// update combobox with formats
updateDefaultFormat();
int index = outputModule->defaultFormatCO->findData(toqstr(
- bp_.defaultOutputFormat));
+ bp_.default_output_format));
// set to default if format is not found
if (index == -1)
index = 0;
outputModule->defaultFormatCO->setCurrentIndex(index);
- outputModule->xetexCB->setEnabled(bp_.baseClass()->outputType() == lyx::LATEX);
- outputModule->xetexCB->setChecked(
- bp_.baseClass()->outputType() == lyx::LATEX && bp_.useXetex);
+ fontModule->osFontsCB->setEnabled(bp_.baseClass()->outputType() == lyx::LATEX);
+ fontModule->osFontsCB->setChecked(
+ bp_.baseClass()->outputType() == lyx::LATEX && bp_.useNonTeXFonts);
+
+ outputModule->outputsyncCB->setChecked(bp_.output_sync);
+ outputModule->synccustomCB->setEditText(toqstr(bp_.output_sync_macro));
+
+ outputModule->mathimgSB->setValue(bp_.html_math_img_scale);
+ outputModule->mathoutCB->setCurrentIndex(bp_.html_math_output);
+ outputModule->strictCB->setChecked(bp_.html_be_strict);
// Fonts
updateFontsize(documentClass().opt_fontsize(),
bp_.fontsize);
- if (bp_.useXetex) {
+ if (bp_.useNonTeXFonts) {
fontModule->fontencLA->setEnabled(false);
fontModule->fontencCO->setEnabled(false);
fontModule->fontencLE->setEnabled(false);
for (int i = 0; i < fontModule->fontsRomanCO->count(); ++i) {
- if (fontModule->fontsRomanCO->itemText(i) == toqstr(bp_.fontsRoman)) {
+ if (fontModule->fontsRomanCO->itemText(i) == toqstr(bp_.fonts_roman)) {
fontModule->fontsRomanCO->setCurrentIndex(i);
- return;
+ break;
}
}
for (int i = 0; i < fontModule->fontsSansCO->count(); ++i) {
- if (fontModule->fontsSansCO->itemText(i) == toqstr(bp_.fontsSans)) {
+ if (fontModule->fontsSansCO->itemText(i) == toqstr(bp_.fonts_sans)) {
fontModule->fontsSansCO->setCurrentIndex(i);
- return;
+ break;
}
}
for (int i = 0; i < fontModule->fontsTypewriterCO->count(); ++i) {
if (fontModule->fontsTypewriterCO->itemText(i) ==
- toqstr(bp_.fontsTypewriter)) {
+ toqstr(bp_.fonts_typewriter)) {
fontModule->fontsTypewriterCO->setCurrentIndex(i);
- return;
+ break;
}
}
} else {
fontModule->fontencLA->setEnabled(true);
fontModule->fontencCO->setEnabled(true);
fontModule->fontencLE->setEnabled(true);
- int n = findToken(tex_fonts_roman, bp_.fontsRoman);
+ int n = findToken(tex_fonts_roman, bp_.fonts_roman);
if (n >= 0) {
fontModule->fontsRomanCO->setCurrentIndex(n);
romanChanged(n);
}
- n = findToken(tex_fonts_sans, bp_.fontsSans);
+ n = findToken(tex_fonts_sans, bp_.fonts_sans);
if (n >= 0) {
fontModule->fontsSansCO->setCurrentIndex(n);
sansChanged(n);
}
- n = findToken(tex_fonts_monospaced, bp_.fontsTypewriter);
+ n = findToken(tex_fonts_monospaced, bp_.fonts_typewriter);
if (n >= 0) {
fontModule->fontsTypewriterCO->setCurrentIndex(n);
ttChanged(n);
}
}
- if (!bp_.fontsCJK.empty())
+ if (!bp_.fonts_cjk.empty())
fontModule->cjkFontLE->setText(
- toqstr(bp_.fontsCJK));
+ toqstr(bp_.fonts_cjk));
else
fontModule->cjkFontLE->setText(QString());
- fontModule->fontScCB->setChecked(bp_.fontsSC);
- fontModule->fontOsfCB->setChecked(bp_.fontsOSF);
- fontModule->scaleSansSB->setValue(bp_.fontsSansScale);
- fontModule->scaleTypewriterSB->setValue(bp_.fontsTypewriterScale);
+ fontModule->fontScCB->setChecked(bp_.fonts_expert_sc);
+ fontModule->fontOsfCB->setChecked(bp_.fonts_old_figures);
+ fontModule->scaleSansSB->setValue(bp_.fonts_sans_scale);
+ fontModule->scaleTypewriterSB->setValue(bp_.fonts_typewriter_scale);
- int nn = findToken(GuiDocument::fontfamilies, bp_.fontsDefaultFamily);
+ int nn = findToken(GuiDocument::fontfamilies, bp_.fonts_default_family);
if (nn >= 0)
fontModule->fontsDefaultCO->setCurrentIndex(nn);
- if (bp_.fontenc == "global")
+ if (bp_.fontenc == "global") {
fontModule->fontencCO->setCurrentIndex(0);
- else if (bp_.fontenc == "default")
+ fontModule->fontencLE->setEnabled(false);
+ } else if (bp_.fontenc == "default") {
fontModule->fontencCO->setCurrentIndex(2);
- else {
+ fontModule->fontencLE->setEnabled(false);
+ } else {
fontModule->fontencCO->setCurrentIndex(1);
fontModule->fontencLE->setText(toqstr(bp_.fontenc));
}
@@ -2782,7 +2941,7 @@ void GuiDocument::paramsToDialog()
// margins
Ui::MarginsUi * m = marginsModule;
- setMargins(!bp_.use_geometry);
+ setMargins();
lengthToWidgets(m->topLE, m->topUnit,
bp_.topmargin, defaultUnit);
@@ -2898,9 +3057,9 @@ void GuiDocument::updateIncludeonlys()
masterChildModule->maintainAuxCB->setEnabled(true);
}
QTreeWidgetItem * item = 0;
- std::vector children = buffer().getChildren(false);
- vector::const_iterator it = children.begin();
- vector::const_iterator end = children.end();
+ ListOfBuffers children = buffer().getChildren();
+ ListOfBuffers::const_iterator it = children.begin();
+ ListOfBuffers::const_iterator end = children.end();
bool has_unincluded = false;
bool all_unincluded = true;
for (; it != end; ++it) {
@@ -2972,13 +3131,25 @@ void GuiDocument::setLayoutComboByIDString(string const & idString)
bool GuiDocument::isValid()
{
- return validateListingsParameters().isEmpty()
- && (textLayoutModule->skipCO->currentIndex() != 3
- || !textLayoutModule->skipLE->text().isEmpty()
- || textLayoutModule->indentRB->isChecked())
- && (textLayoutModule->indentCO->currentIndex() != 1
- || !textLayoutModule->indentLE->text().isEmpty()
- || textLayoutModule->skipRB->isChecked());
+ return
+ validateListingsParameters().isEmpty() &&
+ localLayout->isValid() &&
+ (
+ // if we're asking for skips between paragraphs
+ !textLayoutModule->skipRB->isChecked() ||
+ // then either we haven't chosen custom
+ textLayoutModule->skipCO->currentIndex() != 3 ||
+ // or else a length has been given
+ !textLayoutModule->skipLE->text().isEmpty()
+ ) &&
+ (
+ // if we're asking for indentation
+ !textLayoutModule->indentRB->isChecked() ||
+ // then either we haven't chosen custom
+ textLayoutModule->indentCO->currentIndex() != 1 ||
+ // or else a length has been given
+ !textLayoutModule->indentLE->text().isEmpty()
+ );
}
@@ -3093,7 +3264,7 @@ void GuiDocument::dispatchParams()
if (!params().master.empty()) {
FileName const master_file = support::makeAbsPath(params().master,
support::onlyPath(buffer().absFileName()));
- if (isLyXFilename(master_file.absFileName())) {
+ if (isLyXFileName(master_file.absFileName())) {
Buffer * master = checkAndLoadLyXFile(master_file);
if (master) {
if (master->isChild(const_cast(&buffer())))
@@ -3148,7 +3319,8 @@ void GuiDocument::dispatchParams()
dispatch(FuncRequest(LFUN_SET_COLOR, str));
}
}
- // FIXME: If we used an LFUN, we would not need those two lines:
+ // FIXME LFUN
+ // If we used an LFUN, we would not need these two lines:
BufferView * bv = const_cast(bufferview());
bv->processUpdateFlags(Update::Force | Update::FitCursor);
}
@@ -3196,7 +3368,7 @@ bool GuiDocument::isFontAvailable(string const & font) const
bool GuiDocument::providesOSF(string const & font) const
{
- if (outputModule->xetexCB->isChecked())
+ if (fontModule->osFontsCB->isChecked())
// FIXME: we should check if the fonts really
// have OSF support. But how?
return true;
@@ -3210,7 +3382,7 @@ bool GuiDocument::providesOSF(string const & font) const
bool GuiDocument::providesSC(string const & font) const
{
- if (outputModule->xetexCB->isChecked())
+ if (fontModule->osFontsCB->isChecked())
return false;
if (font == "palatino")
return isFontAvailable("mathpazo");
@@ -3222,7 +3394,7 @@ bool GuiDocument::providesSC(string const & font) const
bool GuiDocument::providesScale(string const & font) const
{
- if (outputModule->xetexCB->isChecked())
+ if (fontModule->osFontsCB->isChecked())
return true;
return font == "helvet" || font == "luximono"
|| font == "berasans" || font == "beramono";