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

bug fix (spaces were ignored in input even within \mathrm)

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@2565 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2001-08-21 07:03:46 +00:00
parent 73a033b81e
commit 6fd8c362c0
1 changed files with 16 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/mathed/math_parser.C
View File

@ -229,7 +229,7 @@ public:
///
MathMatrixInset * parse_normal();
///
void parse_into(MathArray & array, unsigned flags);
void parse_into(MathArray & array, unsigned flags, MathTextCodes = LM_TC_MIN);
///
int lineno() const { return lineno_; }
///
@ -612,7 +612,7 @@ latexkeys const * Parser::read_delim()
}
void Parser::parse_into(MathArray & array, unsigned flags)
void Parser::parse_into(MathArray & array, unsigned flags, MathTextCodes code)
{
MathTextCodes yyvarcode = LM_TC_MIN;
@ -668,7 +668,8 @@ void Parser::parse_into(MathArray & array, unsigned flags)
else if (t.cat() == catLetter)
array.push_back(new MathCharInset(t.character(), yyvarcode));
else if (t.cat() == catSpace && yyvarcode == LM_TC_TEXTRM)
else if (t.cat() == catSpace &&
(yyvarcode == LM_TC_TEXTRM || code == LM_TC_TEXTRM))
array.push_back(new MathCharInset(' ', yyvarcode));
else if (t.cat() == catParameter) {
@ -835,11 +836,21 @@ void Parser::parse_into(MathArray & array, unsigned flags)
if (l) {
if (l->token == LM_TK_FONT) {
//lyxerr << "starting font\n";
//CatCode catSpaceSave = theCatcode[' '];
//if (l->id == LM_TC_TEXTRM) {
// // temporarily change catcode
// theCatcode[' '] = catLetter;
//}
MathTextCodes t = static_cast<MathTextCodes>(l->id);
MathArray ar;
parse_into(ar, FLAG_ITEM);
parse_into(ar, FLAG_ITEM, t);
for (MathArray::iterator it = ar.begin(); it != ar.end(); ++it)
(*it)->handleFont(static_cast<MathTextCodes>(l->id));
(*it)->handleFont(t);
array.push_back(ar);
// undo catcode changes
////theCatcode[' '] = catSpaceSave;
//lyxerr << "ending font\n";
}