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

Backport fix for #7014.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/branches/BRANCH_1_6_X@36029 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Richard Heck 2010-11-04 11:55:20 +00:00
parent dba9e1ec41
commit fa0f9192fc
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/BufferParams.cpp
View File

@ -453,6 +453,8 @@ VSpace const & BufferParams::getDefSkip() const
void BufferParams::setDefSkip(VSpace const & vs) void BufferParams::setDefSkip(VSpace const & vs)
{ {
// DEFSKIP will cause an infinite loop
LASSERT(vs.kind() != VSpace::DEFSKIP, return);
pimpl_->defskip = vs; pimpl_->defskip = vs;
} }
@ -532,11 +534,11 @@ string BufferParams::readToken(Lexer & lex, string const & token,
paragraph_separation = parseptranslator().find(parsep); paragraph_separation = parseptranslator().find(parsep);
} else if (token == "\\defskip") { } else if (token == "\\defskip") {
lex.next(); lex.next();
string defskip = lex.getString(); string const defskip = lex.getString();
if (defskip == "defskip")
// this is invalid
defskip = "medskip";
pimpl_->defskip = VSpace(defskip); pimpl_->defskip = VSpace(defskip);
if (pimpl_->defskip.kind() == VSpace::DEFSKIP)
// that is invalid
pimpl_->defskip = VSpace(VSpace::MEDSKIP);
} else if (token == "\\quotes_language") { } else if (token == "\\quotes_language") {
string quotes_lang; string quotes_lang;
lex >> quotes_lang; lex >> quotes_lang;

2
status.16x
View File

@ -52,6 +52,8 @@ What's new
- Add support for the math command \ddddot (part of bug 6872). - Add support for the math command \ddddot (part of bug 6872).
- Fix crash due to unrecognized \defskip (bug 7014).
* USER INTERFACE * USER INTERFACE