Author: spitz
Date: Wed Jan 19 12:21:34 2011
New Revision: 37259
URL: http://www.lyx.org/trac/changeset/37259
Log:
* InsetBox.cpp: framed boxes can have paragraph breaks and environments.
Modified:
lyx-devel/branches/BRANCH_1_6_X/src/insets/InsetBox.cpp
lyx-devel/branches/BRANCH_1_6_X/status.16x
Modified: lyx-devel/branches/BRANCH_1_6_X/src/insets/InsetBox.cpp
==============================================================================
--- lyx-devel/branches/BRANCH_1_6_X/src/insets/InsetBox.cpp Wed Jan 19
12:18:52 2011 (r37258)
+++ lyx-devel/branches/BRANCH_1_6_X/src/insets/InsetBox.cpp Wed Jan 19
12:21:34 2011 (r37259)
@@ -190,7 +190,8 @@
bool InsetBox::forcePlainLayout(idx_type) const
{
- return !params_.inner_box && params_.type != "Shaded";
+ return !params_.inner_box && params_.type != "Shaded"
+ && params_.type != "Framed";
}
@@ -243,7 +244,9 @@
return true;
case LFUN_BREAK_PARAGRAPH:
- if (params_.inner_box || params_.type == "Shaded")
+ if (params_.inner_box
+ || params_.type == "Shaded"
+ || params_.type == "Framed")
return InsetCollapsable::getStatus(cur, cmd, flag);
flag.setEnabled(false);
return true;
Modified: lyx-devel/branches/BRANCH_1_6_X/status.16x
==============================================================================
--- lyx-devel/branches/BRANCH_1_6_X/status.16x Wed Jan 19 12:18:52 2011
(r37258)
+++ lyx-devel/branches/BRANCH_1_6_X/status.16x Wed Jan 19 12:21:34 2011
(r37259)
@@ -88,6 +88,9 @@
- Fix crash when inserting quotes with a selection spanning multiple
paragraphs (bug 7200).
+- Fix crash when clicking on begin of unfinished command in math
+ when autocomplete is active (bug 7209).
+
- Fix assertion when pasting a column in a math matrix (bug 7106).
- Remove traces of long removed index settings dialog. This fixes a crash
@@ -178,8 +181,7 @@
- Don't allow to set an alignment for rows in math substack environments
(bug 2498).
-- Fix crash when clicking on begin of unfinished command in math
- when autocomplete is active (bug 7209).
+- Allow paragraph breaks and nested environments in framed boxes.
* DOCUMENTATION AND LOCALIZATION
