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

Fix LFUN_MATH_AMS_MATRIX: it was possible to generate corrupt documents (part of #8359)

Browse Source
This commit is contained in:
Juergen Spitzmueller 2014-02-10 09:23:17 +01:00
parent 07baa69875
commit adc78fac32
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/LyXAction.cpp
View File

@ -1673,10 +1673,12 @@ void LyXAction::init()
{ LFUN_MATH_MATRIX, "math-matrix", Noop, Math }, { LFUN_MATH_MATRIX, "math-matrix", Noop, Math },
/*! /*!
* \var lyx::FuncCode lyx::LFUN_MATH_AMS_MATRIX * \var lyx::FuncCode lyx::LFUN_MATH_AMS_MATRIX
* \li Action: Inserts a matrix. * \li Action: Inserts an extended matrix as provided by the amsmath package.
* \li Syntax: math-matrix <COLS> <ROWS> [<DECORATION>] * \li Syntax: math-matrix <COLS> <ROWS> [<DECORATION>]
* \li Params: <DECORATION>: Decoration determines the LaTeX name of the matrix * \li Params: <DECORATION>: Decoration determines the LaTeX name of the matrix
that should be created. that should be created. Possible values include
pmatrix, bmatrix, Bmatrix, vmatrix, Vmatrix and
matrix. The default is 'matrix'.
* \li Sample: math-ams-matrix 3 3 bmatrix * \li Sample: math-ams-matrix 3 3 bmatrix
* \endvar * \endvar
*/ */

8
src/mathed/InsetMathNest.cpp
View File

@ -1076,13 +1076,19 @@ void InsetMathNest::doDispatch(Cursor & cur, FuncRequest & cmd)
cur.recordUndo(); cur.recordUndo();
unsigned int m = 1; unsigned int m = 1;
unsigned int n = 1; unsigned int n = 1;
docstring name; docstring name = from_ascii("matrix");
idocstringstream is(cmd.argument()); idocstringstream is(cmd.argument());
is >> m >> n >> name; is >> m >> n >> name;
if (m < 1) if (m < 1)
m = 1; m = 1;
if (n < 1) if (n < 1)
n = 1; n = 1;
// check if we have a valid decoration
if (name != "pmatrix" && name != "bmatrix"
&& name != "Bmatrix" && name != "vmatrix"
&& name != "Vmatrix" && name != "matrix")
name = from_ascii("matrix");
cur.niceInsert( cur.niceInsert(
MathAtom(new InsetMathAMSArray(buffer_, name, m, n))); MathAtom(new InsetMathAMSArray(buffer_, name, m, n)));
break; break;