X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiDocument.cpp;h=d51f8e6f0709d1a3f3e92e4e6a9a259c46b96839;hb=64f979cb0698670589793f0c613094535cf93bf2;hp=21a3e8f5c2ea930be00395569374939dd2ed4d46;hpb=62ca7f3ae55ad2e0c395cb554d71afab87de1ee3;p=lyx.git

diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index 21a3e8f5c2..d51f8e6f07 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,79 @@ 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("<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; \">") 
+		  + invalid + toqstr("</p>");
+
+	string const layout = fromqstr(locallayoutTE->document()->toPlainText());
+	if (layout.empty())
+		is_valid_ = true;
+	else
+		is_valid_ = TextClass::validate(layout);
+	infoLB->setText(is_valid_ ? vtext : ivtext);
+	validatePB->setEnabled(false);
+}
+
+
+void LocalLayout::validatePressed() {
+	validate();
+	changed();
+}
+
+
 /////////////////////////////////////////////////////////////////////
 //
 // DocumentDialog
@@ -655,7 +729,21 @@ GuiDocument::GuiDocument(GuiView & lv)
 		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<Ui::FontUi>;
@@ -715,7 +803,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 +839,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();
@@ -1035,6 +1145,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
@@ -1140,6 +1254,7 @@ GuiDocument::GuiDocument(GuiView & lv)
 	docPS->addPanel(branchesModule, qt_("Branches"));
 	docPS->addPanel(outputModule, qt_("Output"));
 	docPS->addPanel(preambleModule, qt_("LaTeX Preamble"));
+	docPS->addPanel(localLayout, qt_("Local Layout"));
 	docPS->setCurrentPanel(qt_("Document Class"));
 // FIXME: hack to work around resizing bug in Qt >= 4.2
 // bug verified with Qt 4.2.{0-3} (JSpitzm)
@@ -1149,12 +1264,6 @@ GuiDocument::GuiDocument(GuiView & lv)
 }
 
 
-void GuiDocument::showPreamble()
-{
-	docPS->setCurrentPanel(qt_("LaTeX Preamble"));
-}
-
-
 void GuiDocument::saveDefaultClicked()
 {
 	saveDocDefault();
@@ -1276,13 +1385,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 +1393,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);
 }
 
 
@@ -1502,7 +1605,10 @@ void GuiDocument::xetexChanged(bool xetex)
 	
 	fontModule->fontencLA->setEnabled(!xetex);
 	fontModule->fontencCO->setEnabled(!xetex);
-	fontModule->fontencLE->setEnabled(!xetex);
+	if (xetex)
+		fontModule->fontencLE->setEnabled(false);
+	else
+		fontencChanged(fontModule->fontencCO->currentIndex());
 }
 
 
@@ -1639,7 +1745,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 +1753,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"
@@ -1801,13 +1907,13 @@ 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)"), from_utf8(*it))));
 			else
 				retval.push_back(mod->getName());
 		}
 		return retval;
 	}
-}
+} // end anonymous namespace
 
 
 void GuiDocument::modulesToParams(BufferParams & bp)
@@ -1987,6 +2093,7 @@ void GuiDocument::applyView()
 {
 	// preamble
 	preambleModule->apply(bp_);
+	localLayout->apply(bp_);
 
 	// date
 	bp_.suppress_date = latexModule->suppressDateCB->isChecked();
@@ -2157,10 +2264,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())
@@ -2255,6 +2366,18 @@ void GuiDocument::applyView()
 	bool const xetex = outputModule->xetexCB->isChecked();
 	bp_.useXetex = xetex;
 
+	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<BufferParams::MathOutput>(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 (fontModule->fontsRomanCO->currentIndex() == 0)
@@ -2319,10 +2442,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 +2459,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,6 +2510,7 @@ void GuiDocument::paramsToDialog()
 
 	// preamble
 	preambleModule->update(bp_, id());
+	localLayout->update(bp_, id());
 
 	// date
 	latexModule->suppressDateCB->setChecked(bp_.suppress_date);
@@ -2681,6 +2800,13 @@ void GuiDocument::paramsToDialog()
 	outputModule->xetexCB->setChecked(
 		bp_.baseClass()->outputType() == lyx::LATEX && bp_.useXetex);
 
+	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);
@@ -2747,11 +2873,13 @@ void GuiDocument::paramsToDialog()
 	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 +2910,7 @@ void GuiDocument::paramsToDialog()
 	// margins
 	Ui::MarginsUi * m = marginsModule;
 
-	setMargins(!bp_.use_geometry);
+	setMargins();
 
 	lengthToWidgets(m->topLE, m->topUnit,
 		bp_.topmargin, defaultUnit);
@@ -2972,13 +3100,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 +3233,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 *>(&buffer())))