anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-13 09:15:50 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug #6246: InsetMathKern is broken

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@31483 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Enrico Forestieri 2009-09-28 22:11:02 +00:00
parent caf70b9960
commit 391659b5af
3 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mathed/InsetMathKern.cpp
View File

@ -57,12 +57,18 @@ void InsetMathKern::draw(PainterInfo &, int, int) const
void InsetMathKern::write(WriteStream & os) const void InsetMathKern::write(WriteStream & os) const
{ {
if (wid_.empty())
os << "\\kern" << ' ';
else
os << "\\kern" << from_utf8(wid_.asLatexString()) << ' '; os << "\\kern" << from_utf8(wid_.asLatexString()) << ' ';
} }
void InsetMathKern::normalize(NormalStream & os) const void InsetMathKern::normalize(NormalStream & os) const
{ {
if (wid_.empty())
os << "[kern]";
else
os << "[kern " << from_utf8(wid_.asLatexString()) << ']'; os << "[kern " << from_utf8(wid_.asLatexString()) << ']';
} }

7
src/mathed/MathParser.cpp
View File

@ -1552,9 +1552,13 @@ bool Parser::parse1(InsetMathGrid & grid, unsigned flags,
else if (t.cs() == "kern") { else if (t.cs() == "kern") {
// FIXME: A hack... // FIXME: A hack...
docstring s; docstring s;
int num_tokens = 0;
while (true) { while (true) {
Token const & t = getToken(); Token const & t = getToken();
++num_tokens;
if (!good()) { if (!good()) {
s.clear();
while (num_tokens--)
putback(); putback();
break; break;
} }
@ -1562,6 +1566,9 @@ bool Parser::parse1(InsetMathGrid & grid, unsigned flags,
if (isValidLength(to_utf8(s))) if (isValidLength(to_utf8(s)))
break; break;
} }
if (s.empty())
cell->push_back(MathAtom(new InsetMathKern));
else
cell->push_back(MathAtom(new InsetMathKern(s))); cell->push_back(MathAtom(new InsetMathKern(s)));
} }

2
status.16x
View File

@ -150,6 +150,8 @@ What's new
- Fix the painting of RTL text. All rows except the last one of a - Fix the painting of RTL text. All rows except the last one of a
paragraph were painted slightly too far to the left (bug 3997). paragraph were painted slightly too far to the left (bug 3997).
- Fix the \kern primitive in mathed (bug 6246).
* DOCUMENTATION AND LOCALIZATION * DOCUMENTATION AND LOCALIZATION