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

By default, charstyles should not permit layout changes internally.

Browse Source 
Fixes #10237.

(cherry picked from commit 152817576a)
This commit is contained in:
Richard Heck 2016-06-20 11:30:32 -04:00
parent d1c11283a3
commit 774c00c457
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/insets/InsetLayout.cpp
View File

@ -226,8 +226,11 @@ bool InsetLayout::read(Lexer & lex, TextClass const & tclass)
lyxtype_ = translateLyXType(lt); lyxtype_ = translateLyXType(lt);
if (lyxtype_ == NOLYXTYPE) if (lyxtype_ == NOLYXTYPE)
LYXERR0("Unknown LyXType `" << lt << "'."); LYXERR0("Unknown LyXType `" << lt << "'.");
if (lyxtype_ == CHARSTYLE) if (lyxtype_ == CHARSTYLE) {
// by default, charstyles force the plain layout
multipar_ = false; multipar_ = false;
forceplain_ = true;
}
break; break;
} }
case IL_LATEXTYPE: { case IL_LATEXTYPE: {

3
status.22x
View File

@ -81,6 +81,8 @@ What's new
* USER INTERFACE * USER INTERFACE
- CharStyles now prohibit layout changes by default (bug 10237).
- Fix display of labels in right-to-left languages (bug 10169). - Fix display of labels in right-to-left languages (bug 10169).
- When a counter is stepped, reset recursively all subcounters (bug #10063). - When a counter is stepped, reset recursively all subcounters (bug #10063).
@ -137,6 +139,7 @@ What's new
- Fix drawing of buttons by enforcing equal left/right spacing (bug 10147). - Fix drawing of buttons by enforcing equal left/right spacing (bug 10147).
* INTERNALS * INTERNALS