X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FGuiDelimiter.cpp;h=104cb761bd62a9f833ea5ff26eee991c926eff62;hb=c49cd699;hp=7182870f2feacd9295fbbd15bffa6ce032de50d8;hpb=42015a8ebd17092c9b55c9519015119d04f52218;p=lyx.git diff --git a/src/frontends/qt4/GuiDelimiter.cpp b/src/frontends/qt4/GuiDelimiter.cpp index 7182870f2f..104cb761bd 100644 --- a/src/frontends/qt4/GuiDelimiter.cpp +++ b/src/frontends/qt4/GuiDelimiter.cpp @@ -13,23 +13,38 @@ #include "GuiDelimiter.h" #include "GuiApplication.h" +#include "GuiFontLoader.h" #include "GuiView.h" - #include "qt_helpers.h" -#include "gettext.h" + +#include "FontEnums.h" +#include "FontInfo.h" +#include "FuncRequest.h" + +#include "support/debug.h" +#include "support/docstring.h" +#include "support/gettext.h" +#include "support/lstrings.h" #include #include #include +#include + +#include +#include -// Set to zero if unicode symbols are preferred. -#define USE_PIXMAP 1 +using namespace std; + +namespace lyx { +namespace frontend { -using std::string; +namespace { static char const * latex_delimiters[] = { "(", ")", "{", "}", "[", "]", "lceil", "rceil", "lfloor", "rfloor", "langle", "rangle", + "llbracket", "rrbracket", "uparrow", "updownarrow", "Uparrow", "Updownarrow", "downarrow", "Downarrow", "|", "Vert", "/", "backslash", "" }; @@ -38,9 +53,9 @@ static char const * latex_delimiters[] = { static int const nr_latex_delimiters = sizeof(latex_delimiters) / sizeof(char const *); -static QString const bigleft[] = {"", "bigl", "Bigl", "biggl", "Biggl"}; +static string const bigleft[] = {"", "bigl", "Bigl", "biggl", "Biggl"}; -static QString const bigright[] = {"", "bigr", "Bigr", "biggr", "Biggr"}; +static string const bigright[] = {"", "bigr", "Bigr", "biggr", "Biggr"}; static char const * const biggui[] = { N_("big[[delimiter size]]"), @@ -53,27 +68,122 @@ static char const * const biggui[] = { // FIXME: It might be better to fix the big delim LFUN to not require // additional '\' prefix. -static QString fix_name(QString const & str, bool big) +static docstring fix_name(string const & str, bool big) { - if (str.isEmpty()) - return "."; + if (str.empty()) + return from_ascii("."); if (!big || str == "(" || str == ")" || str == "[" || str == "]" || str == "|" || str == "/") - return str; + return from_ascii(str); - return "\\" + str; + return "\\" + from_ascii(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 math_symbols_; +/// Math-symbol / TeX-name map. +/// This one is for fast search, it contains the same data as +/// \c math_symbols_. +static map 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::const_iterator it = math_symbols_.begin(); + map::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::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::const_iterator it = + tex_names_.find(math_symbol); + + static string const empty_string; + if (it == tex_names_.end()) + return empty_string; + + return it->second; +} + + +void setDelimiterName(QListWidgetItem * lwi, string const & name) +{ + lwi->setData(Qt::UserRole, toqstr(name)); +} + + +string getDelimiterName(QListWidgetItem const * lwi) +{ + return fromqstr(lwi->data(Qt::UserRole).toString()); +} + + +} // 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,34 +192,59 @@ GuiDelimiter::GuiDelimiter(GuiView & lv) leftLW->setViewMode(QListView::IconMode); rightLW->setViewMode(QListView::IconMode); - typedef std::map ListItems; + leftLW->setDragDropMode(QAbstractItemView::NoDragDrop); + rightLW->setDragDropMode(QAbstractItemView::NoDragDrop); + + initMathSymbols(); + + FontInfo lyxfont; + lyxfont.setFamily(CMR_FAMILY); + QFontMetrics fm(frontend::getFont(lyxfont)); + QSize item_size(fm.maxWidth(), fm.height() + 8); + + leftLW->setMinimumWidth(5 * item_size.width()); + rightLW->setMinimumWidth(5 * item_size.width()); + + typedef map ListItems; ListItems list_items; // The last element is the empty one. int const end = nr_latex_delimiters - 1; for (int i = 0; i < end; ++i) { string const delim = latex_delimiters[i]; - MathSymbol const & ms = mathSymbol(delim); + MathSymbol const & ms = mathSymbol(delim); 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); + setDelimiterName(lwi, delim); + lwi->setToolTip(toqstr(delim)); + lwi->setSizeHint(item_size); + switch (ms.fontfamily) { + case CMSY_FAMILY: + case STMARY_FAMILY: + // Hack to work around the broken metrics of these fonts + // FIXME: Better fix the fonts or use fonts that are not broken + lwi->setTextAlignment(Qt::AlignTop | Qt::AlignHCenter); + break; + default: + lwi->setTextAlignment(Qt::AlignCenter); + } list_items[ms.unicode] = lwi; leftLW->addItem(lwi); } for (int i = 0; i != leftLW->count(); ++i) { - MathSymbol const & ms = mathSymbol( - fromqstr(leftLW->item(i)->toolTip())); + MathSymbol const & ms = mathSymbol(getDelimiterName(leftLW->item(i))); rightLW->addItem(list_items[doMatch(ms.unicode)]->clone()); } // 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")); @@ -117,6 +252,8 @@ GuiDelimiter::GuiDelimiter(GuiView & lv) sizeCO->addItem(qt_(biggui[i])); on_leftLW_currentRowChanged(0); + // synchronise the scroll bars + on_matchCB_stateChanged(matchCB->checkState()); bc().setPolicy(ButtonPolicy::IgnorantPolicy); } @@ -138,6 +275,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; @@ -150,15 +289,17 @@ void GuiDelimiter::updateTeXCode(int size) { bool const bigsize = size != 0; - QString left_str = fix_name(leftLW->currentItem()->toolTip(), bigsize); - QString right_str = fix_name(rightLW->currentItem()->toolTip(), bigsize); + docstring left_str = fix_name(getDelimiterName(leftLW->currentItem()), + bigsize); + docstring right_str = fix_name(getDelimiterName(rightLW->currentItem()), + bigsize); if (!bigsize) tex_code_ = left_str + ' ' + right_str; else { - tex_code_ = bigleft[size] + ' ' + tex_code_ = from_ascii(bigleft[size]) + ' ' + left_str + ' ' - + bigright[size] + ' ' + + from_ascii(bigright[size]) + ' ' + right_str; } @@ -167,33 +308,41 @@ void GuiDelimiter::updateTeXCode(int size) // FIXME: retrieve the LateX code directly from mathed. // In all cases, we want the '\' prefix if needed, so we pass 'true' // to fix_name. - left_str = fix_name(leftLW->currentItem()->toolTip(), true); - right_str = fix_name(rightLW->currentItem()->toolTip(), true); - QString code_str; + left_str = fix_name(getDelimiterName(leftLW->currentItem()), + true); + right_str = fix_name(getDelimiterName(rightLW->currentItem()), + true); + docstring code_str; if (!bigsize) code_str = "\\left" + left_str + " \\right" + right_str; else { // There should be nothing in the TeX-code when the delimiter is "None". if (left_str != ".") - code_str = "\\" + bigleft[size] + left_str + ' '; + code_str = "\\" + from_ascii(bigleft[size]) + left_str + ' '; if (right_str != ".") - code_str += "\\" + bigright[size] + right_str; + code_str += "\\" + from_ascii(bigright[size]) + right_str; } - texCodeL->setText(qt_("TeX Code: ") + code_str); + texCodeL->setText(qt_("TeX Code: ") + toqstr(code_str)); + + // Enable the Swap button with non-matched pairs + bool const allow_swap = + (doMatch(mathSymbol(getDelimiterName(leftLW->currentItem())).unicode) + != mathSymbol(getDelimiterName(rightLW->currentItem())).unicode); + swapPB->setEnabled(allow_swap); } void GuiDelimiter::on_insertPB_clicked() { if (sizeCO->currentIndex() == 0) - dispatchDelim(fromqstr(tex_code_)); + dispatch(FuncRequest(LFUN_MATH_DELIM, tex_code_)); else { - QString command = '"' + tex_code_ + '"'; - command.replace(' ', "\" \""); - dispatchBigDelim(fromqstr(command)); + docstring command = '"' + tex_code_ + '"'; + command = support::subst(command, from_ascii(" "), from_ascii("\" \"")); + dispatch(FuncRequest(LFUN_MATH_BIGDELIM, command)); } - } +} void GuiDelimiter::on_sizeCO_activated(int index) @@ -204,6 +353,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 +363,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(); } @@ -236,9 +391,60 @@ void GuiDelimiter::on_rightLW_currentRowChanged(int item) void GuiDelimiter::on_matchCB_stateChanged(int state) { - if (state == Qt::Checked) + // Synchronise the vertical scroll bars when checked + QScrollBar * ls = leftLW->verticalScrollBar(); + QScrollBar * rs = rightLW->verticalScrollBar(); + + if (state == Qt::Checked) { on_leftLW_currentRowChanged(leftLW->currentRow()); + connect(ls, SIGNAL(valueChanged(int)), rs, SLOT(setValue(int)), + Qt::UniqueConnection); + connect(rs, SIGNAL(valueChanged(int)), ls, SLOT(setValue(int)), + Qt::UniqueConnection); + rs->setValue(ls->value()); + } else { + ls->disconnect(rs); + rs->disconnect(ls); + } + + updateTeXCode(sizeCO->currentIndex()); +} + +void GuiDelimiter::on_swapPB_clicked() +{ + // Get current math symbol for each side. + MathSymbol const & lms = + mathSymbol(getDelimiterName(leftLW->currentItem())); + MathSymbol const & rms = + mathSymbol(getDelimiterName(rightLW->currentItem())); + + // Swap and match. + char_type const lc = doMatch(rms.unicode); + char_type const rc = doMatch(lms.unicode); + + // Convert back to QString to locate them in the widget. + MathSymbol const & nlms = mathSymbol(texName(lc)); + MathSymbol const & nrms = mathSymbol(texName(rc)); + QString lqs(nlms.fontcode ? + QChar(nlms.fontcode) : toqstr(docstring(1, nlms.unicode))); + QString rqs(nrms.fontcode ? + QChar(nrms.fontcode) : toqstr(docstring(1, nrms.unicode))); + + // Handle unencoded "symbol" of "(None)". + if (lqs.toStdString() == "?") + lqs = qt_("(None)"); + if(rqs.toStdString() == "?") + rqs = qt_("(None)"); + + // Locate matching QListWidgetItem. + QList lwi = leftLW->findItems(lqs, Qt::MatchExactly); + QList rwi = rightLW->findItems(rqs, Qt::MatchExactly); + + // Select. + leftLW->setCurrentItem(lwi.first()); + rightLW->setCurrentItem(rwi.first()); + updateTeXCode(sizeCO->currentIndex()); } @@ -249,4 +455,4 @@ Dialog * createGuiDelimiter(GuiView & lv) { return new GuiDelimiter(lv); } } // namespace frontend } // namespace lyx -#include "GuiDelimiter_moc.cpp" +#include "moc_GuiDelimiter.cpp"