]> git.lyx.org Git - lyx.git/blobdiff - src/frontends/qt4/GuiDelimiter.cpp
Fix bug #9990: Oversized & Incorrect Glyphs in Math Delimiter Dialog
[lyx.git] / src / frontends / qt4 / GuiDelimiter.cpp
index 635319ca9ceac96c766a9366f1266e7676892b29..31903fc8b46bc0e1a808ad4c9091b3b3844c925b 100644 (file)
 #include "GuiDelimiter.h"
 
 #include "GuiApplication.h"
+#include "GuiFontLoader.h"
 #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>
 
-// Set to zero if unicode symbols are preferred.
-#define USE_PIXMAP 1
+#include <map>
+#include <string>
 
 using namespace std;
 
+namespace lyx {
+namespace frontend {
+
+namespace {
+
 static char const *  latex_delimiters[] = {
        "(", ")", "{", "}", "[", "]",
        "lceil", "rceil", "lfloor", "rfloor", "langle", "rangle",
+       "llbracket", "rrbracket",
        "uparrow", "updownarrow", "Uparrow", "Updownarrow", "downarrow", "Downarrow",
        "|", "Vert", "/", "backslash", ""
 };
@@ -64,16 +76,98 @@ 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;
+};
 
-namespace lyx {
-namespace frontend {
+/// 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_;
+
+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('(', 40, CMR_FAMILY);
+       math_symbols_[")"] = MathSymbol(')', 41, CMR_FAMILY);
+       math_symbols_["{"] = MathSymbol('{', 102, CMSY_FAMILY);
+       math_symbols_["}"] = MathSymbol('}', 103, CMSY_FAMILY);
+       math_symbols_["["] = MathSymbol('[', 91, CMR_FAMILY);
+       math_symbols_["]"] = MathSymbol(']', 93, CMR_FAMILY);
+       math_symbols_["|"] = MathSymbol('|', 106, CMSY_FAMILY);
+       math_symbols_["/"] = MathSymbol('/', 47, CMR_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_["llbracket"] = MathSymbol(0x27e6, 74, STMARY_FAMILY);
+       math_symbols_["rrbracket"] = MathSymbol(0x27e7, 75, STMARY_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 const 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 const empty_string;
+       if (it == tex_names_.end())
+               return empty_string;
+
+       return it->second;
+}
+
+} // anon namespace
 
 
 GuiDelimiter::GuiDelimiter(GuiView & lv)
-       : GuiMath(lv, "mathdelimiter")
+       : GuiDialog(lv, "mathdelimiter", qt_("Math Delimiter"))
 {
        setupUi(this);
-       setViewTitle(_("Math Delimiter"));
 
        connect(closePB, SIGNAL(clicked()), this, SLOT(accept()));
 
@@ -82,6 +176,11 @@ GuiDelimiter::GuiDelimiter(GuiView & lv)
        leftLW->setViewMode(QListView::IconMode);
        rightLW->setViewMode(QListView::IconMode);
 
+       leftLW->setDragDropMode(QAbstractItemView::NoDragDrop);
+       rightLW->setDragDropMode(QAbstractItemView::NoDragDrop);
+
+       initMathSymbols();
+
        typedef map<char_type, QListWidgetItem *> ListItems;
        ListItems list_items;
        // The last element is the empty one.
@@ -92,11 +191,11 @@ GuiDelimiter::GuiDelimiter(GuiView & lv)
                QString symbol(ms.fontcode?
                        QChar(ms.fontcode) : toqstr(docstring(1, ms.unicode)));
                QListWidgetItem * lwi = new QListWidgetItem(symbol);
-               lwi->setToolTip(toqstr(delim));
                FontInfo lyxfont;
                lyxfont.setFamily(ms.fontfamily);
-               QFont const & symbol_font = guiApp->guiFontLoader().get(lyxfont);
-               lwi->setFont(symbol_font);
+               QFont font = frontend::getFont(lyxfont);
+               lwi->setFont(font);
+               lwi->setToolTip(toqstr(delim));
                list_items[ms.unicode] = lwi;
                leftLW->addItem(lwi);
        }
@@ -108,8 +207,10 @@ GuiDelimiter::GuiDelimiter(GuiView & lv)
        }
 
        // The last element is the empty one.
-       leftLW->addItem(qt_("(None)"));
-       rightLW->addItem(qt_("(None)"));
+       QListWidgetItem * lwi = new QListWidgetItem(qt_("(None)"));
+       QListWidgetItem * rwi = new QListWidgetItem(qt_("(None)"));
+       leftLW->addItem(lwi);
+       rightLW->addItem(rwi);
 
        sizeCO->addItem(qt_("Variable"));
 
@@ -138,6 +239,8 @@ char_type GuiDelimiter::doMatch(char_type const symbol)
        else if (str == "lfloor") match = "rfloor";
        else if (str == "rangle") match = "langle";
        else if (str == "langle") match = "rangle";
+       else if (str == "llbracket") match = "rrbracket";
+       else if (str == "rrbracket") match = "llbracket";
        else if (str == "backslash") match = "/";
        else if (str == "/") match = "backslash";
        else return symbol;
@@ -187,11 +290,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)));
        }
  }
 
@@ -204,6 +307,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();
 }
@@ -211,6 +317,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();
 }
@@ -249,4 +358,4 @@ Dialog * createGuiDelimiter(GuiView & lv) { return new GuiDelimiter(lv); }
 } // namespace frontend
 } // namespace lyx
 
-#include "GuiDelimiter_moc.cpp"
+#include "moc_GuiDelimiter.cpp"