X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiDelimiter.cpp;h=0327fd48338bc82ff42bc4c13b8f538ade35a55a;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=3196cc5bf113e285a8fb28348ec3c1051d1bd7a0;hpb=f45523aa7a39a8d78d6ae3e74f52b598e67a9a2d;p=lyx.git

diff --git a/src/frontends/qt4/GuiDelimiter.cpp b/src/frontends/qt4/GuiDelimiter.cpp
index 3196cc5bf1..0327fd4833 100644
--- a/src/frontends/qt4/GuiDelimiter.cpp
+++ b/src/frontends/qt4/GuiDelimiter.cpp
@@ -17,16 +17,27 @@
 #include "GuiView.h"
 #include "qt_helpers.h"
 
+#include "FontEnums.h"
 #include "FontInfo.h"
+#include "FuncRequest.h"
 
 #include "support/gettext.h"
+#include "support/docstring.h"
 
 #include <QPixmap>
 #include <QCheckBox>
 #include <QListWidgetItem>
 
+#include <map>
+#include <string>
+
 using namespace std;
 
+namespace lyx {
+namespace frontend {
+
+namespace {
+
 static char const *  latex_delimiters[] = {
 	"(", ")", "{", "}", "[", "]",
 	"lceil", "rceil", "lfloor", "rfloor", "langle", "rangle",
@@ -64,13 +75,94 @@ static QString fix_name(QString const & str, bool big)
 	return "\\" + str;
 }
 
+struct MathSymbol {
+	MathSymbol(char_type uc = '?', unsigned char fc = 0,
+		FontFamily ff = SYMBOL_FAMILY)
+		: unicode(uc), fontcode(fc), fontfamily(ff)
+	{}
+	char_type unicode;
+	unsigned char fontcode;
+	FontFamily fontfamily;
+};
+
+/// TeX-name / Math-symbol map.
+static map<std::string, MathSymbol> math_symbols_;
+/// Math-symbol / TeX-name map.
+/// This one is for fast search, it contains the same data as
+/// \c math_symbols_.
+static map<char_type, string> tex_names_;
 
-namespace lyx {
-namespace frontend {
+void initMathSymbols()
+{
+	// FIXME: Ideally, those unicode codepoints would be defined
+	// in "lib/symbols". Unfortunately, some of those are already
+	// defined with non-unicode ids for use within mathed.
+	// FIXME 2: We should fill-in this map with the parsed "symbols"
+	// file done in MathFactory.cpp.
+	math_symbols_["("] = MathSymbol('(');
+	math_symbols_[")"] = MathSymbol(')');
+	math_symbols_["{"] = MathSymbol('{');
+	math_symbols_["}"] = MathSymbol('}');
+	math_symbols_["["] = MathSymbol('[');
+	math_symbols_["]"] = MathSymbol(']');
+	math_symbols_["|"] = MathSymbol('|');
+	math_symbols_["/"] = MathSymbol('/', 54, CMSY_FAMILY);
+	math_symbols_["backslash"] = MathSymbol('\\', 110, CMSY_FAMILY);
+	math_symbols_["lceil"] = MathSymbol(0x2308, 100, CMSY_FAMILY);
+	math_symbols_["rceil"] = MathSymbol(0x2309, 101, CMSY_FAMILY);
+	math_symbols_["lfloor"] = MathSymbol(0x230A, 98, CMSY_FAMILY);
+	math_symbols_["rfloor"] = MathSymbol(0x230B, 99, CMSY_FAMILY);
+	math_symbols_["langle"] = MathSymbol(0x2329, 104, CMSY_FAMILY);
+	math_symbols_["rangle"] = MathSymbol(0x232A, 105, CMSY_FAMILY);
+	math_symbols_["uparrow"] = MathSymbol(0x2191, 34, CMSY_FAMILY);
+	math_symbols_["Uparrow"] = MathSymbol(0x21D1, 42, CMSY_FAMILY);
+	math_symbols_["updownarrow"] = MathSymbol(0x2195, 108, CMSY_FAMILY);
+	math_symbols_["Updownarrow"] = MathSymbol(0x21D5, 109, CMSY_FAMILY);
+	math_symbols_["downarrow"] = MathSymbol(0x2193, 35, CMSY_FAMILY);
+	math_symbols_["Downarrow"] = MathSymbol(0x21D3, 43, CMSY_FAMILY);
+	math_symbols_["downdownarrows"] = MathSymbol(0x21CA, 184, MSA_FAMILY);
+	math_symbols_["downharpoonleft"] = MathSymbol(0x21C3, 188, MSA_FAMILY);
+	math_symbols_["downharpoonright"] = MathSymbol(0x21C2, 186, MSA_FAMILY);
+	math_symbols_["vert"] = MathSymbol(0x007C, 106, CMSY_FAMILY);
+	math_symbols_["Vert"] = MathSymbol(0x2016, 107, CMSY_FAMILY);
+
+	map<string, MathSymbol>::const_iterator it = math_symbols_.begin();
+	map<string, MathSymbol>::const_iterator end = math_symbols_.end();
+	for (; it != end; ++it)
+		tex_names_[it->second.unicode] = it->first;
+}
+
+/// \return the math unicode symbol associated to a TeX name.
+MathSymbol const & mathSymbol(string tex_name)
+{
+	map<string, MathSymbol>::const_iterator it =
+		math_symbols_.find(tex_name);
+
+	static MathSymbol unknown_symbol;
+	if (it == math_symbols_.end())
+		return unknown_symbol;
+
+	return it->second;
+}
+
+/// \return the TeX name associated to a math unicode symbol.
+string const & texName(char_type math_symbol)
+{
+	map<char_type, string>::const_iterator it =
+		tex_names_.find(math_symbol);
+
+	static string empty_string;
+	if (it == tex_names_.end())
+		return empty_string;
+
+	return it->second;
+}
+
+} // anon namespace
 
 
 GuiDelimiter::GuiDelimiter(GuiView & lv)
-	: GuiMath(lv, "mathdelimiter", qt_("Math Delimiter"))
+	: GuiDialog(lv, "mathdelimiter", qt_("Math Delimiter"))
 {
 	setupUi(this);
 
@@ -81,6 +173,8 @@ GuiDelimiter::GuiDelimiter(GuiView & lv)
 	leftLW->setViewMode(QListView::IconMode);
 	rightLW->setViewMode(QListView::IconMode);
 
+	initMathSymbols();
+
 	typedef map<char_type, QListWidgetItem *> ListItems;
 	ListItems list_items;
 	// The last element is the empty one.
@@ -185,11 +279,11 @@ void GuiDelimiter::updateTeXCode(int size)
 void GuiDelimiter::on_insertPB_clicked()
 {
 	if (sizeCO->currentIndex() == 0)
-		dispatchDelim(fromqstr(tex_code_));
+		dispatch(FuncRequest(LFUN_MATH_DELIM, fromqstr(tex_code_)));
 	else {
 		QString command = '"' + tex_code_ + '"';
 		command.replace(' ', "\" \"");
-		dispatchBigDelim(fromqstr(command));
+		dispatch(FuncRequest(LFUN_MATH_BIGDELIM, fromqstr(command)));
 	}
  }
 
@@ -202,6 +296,9 @@ void GuiDelimiter::on_sizeCO_activated(int index)
 
 void GuiDelimiter::on_leftLW_itemActivated(QListWidgetItem *)
 {
+	// do not auto-apply if !matchCB->isChecked()
+	if (!matchCB->isChecked())
+		return;
 	on_insertPB_clicked();
 	accept();
 }
@@ -209,6 +306,9 @@ void GuiDelimiter::on_leftLW_itemActivated(QListWidgetItem *)
 
 void GuiDelimiter::on_rightLW_itemActivated(QListWidgetItem *)
 {
+	// do not auto-apply if !matchCB->isChecked()
+	if (!matchCB->isChecked())
+		return;
 	on_insertPB_clicked();
 	accept();
 }
@@ -247,4 +347,4 @@ Dialog * createGuiDelimiter(GuiView & lv) { return new GuiDelimiter(lv); }
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiDelimiter_moc.cpp"
+#include "moc_GuiDelimiter.cpp"