anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-09-19 22:40:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Properly fix #9616

Browse Source 
Now all symbols in the unicodesymbols file having a mathcommand
are not wrapped in a \text inset anymore.

(cherry picked from commit 506324ef9d)
This commit is contained in:
Enrico Forestieri 2019-04-15 20:56:52 +02:00
parent 112616a97b
commit 7998616edb
4 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mathed/MathFactory.cpp
View File

@ -714,10 +714,4 @@ bool createInsetMath_fromDialogStr(docstring const & str, MathData & ar)
}
bool isAsciiOrMathAlpha(char_type c)
{
return isASCII(c) || Encodings::isMathAlpha(c);
}
} // namespace lyx

5
src/mathed/MathFactory.h
View File

@ -33,11 +33,6 @@ MathAtom createInsetMath(char const * const, Buffer * buf);
*/
bool createInsetMath_fromDialogStr(docstring const &, MathData &);
/** Tells whether the argument is an ascii character or is marked as
* mathalpha in the unicodesymbols file.
*/
bool isAsciiOrMathAlpha(char_type);
typedef std::map<docstring, latexkeys> MathWordList;
MathWordList const & mathedWordList();

4
src/mathed/MathParser.cpp
View File

@ -1017,7 +1017,7 @@ bool Parser::parse1(InsetMathGrid & grid, unsigned flags,
else if (t.cat() == catOther) {
char_type c = t.character();
if (isAsciiOrMathAlpha(c)
if (!Encodings::isUnicodeTextOnly(c)
|| mode_ & Parse::VERBATIM
|| !(mode_ & Parse::USETEXT)
|| mode == InsetMath::TEXT_MODE) {
@ -1026,7 +1026,7 @@ bool Parser::parse1(InsetMathGrid & grid, unsigned flags,
MathAtom at = createInsetMath("text", buf);
at.nucleus()->cell(0).push_back(MathAtom(new InsetMathChar(c)));
while (nextToken().cat() == catOther
&& !isAsciiOrMathAlpha(nextToken().character())) {
&& Encodings::isUnicodeTextOnly(nextToken().character())) {
c = getToken().character();
at.nucleus()->cell(0).push_back(MathAtom(new InsetMathChar(c)));
}

2
status.23x
View File

@ -29,6 +29,8 @@ What's new
The "Rows & Columns" optional submenu has been added to the math context menu.
Avoid using text mode for unicode symbols representable in math mode (bug 9616).
* DOCUMENTATION AND LOCALIZATION