Author: forenr
Date: Sun Jun 6 20:38:35 2010
New Revision: 34608
URL: http://www.lyx.org/trac/changeset/34608
Log:
Add GUI support for big delimiters variants without 'l', 'm' or 'r' endings
and for '<' and '>' with all variants.
Modified:
lyx-devel/branches/BRANCH_1_6_X/lib/symbols
lyx-devel/branches/BRANCH_1_6_X/src/mathed/InsetMathBig.cpp
lyx-devel/branches/BRANCH_1_6_X/src/mathed/MathSupport.cpp
lyx-devel/branches/BRANCH_1_6_X/status.16x
Modified: lyx-devel/branches/BRANCH_1_6_X/lib/symbols
==============================================================================
--- lyx-devel/branches/BRANCH_1_6_X/lib/symbols Sun Jun 6 20:11:15 2010
(r34607)
+++ lyx-devel/branches/BRANCH_1_6_X/lib/symbols Sun Jun 6 20:38:35 2010
(r34608)
@@ -42,15 +42,19 @@
vdots dots none
# big delimiters
+big big none
bigl big none
bigm big none
bigr big none
+Big big none
Bigl big none
Bigm big none
Bigr big none
+bigg big none
biggl big none
biggm big none
biggr big none
+Bigg big none
Biggl big none
Biggm big none
Biggr big none
@@ -58,8 +62,10 @@
# packages. No 'm' versions!
# See lucidabr.dtx for a possible implementation if you want to use these
# with other fonts.
+biggg big none
bigggl big none
bigggr big none
+Biggg big none
Bigggl big none
Bigggr big none
Modified: lyx-devel/branches/BRANCH_1_6_X/src/mathed/InsetMathBig.cpp
==============================================================================
--- lyx-devel/branches/BRANCH_1_6_X/src/mathed/InsetMathBig.cpp Sun Jun 6
20:11:15 2010 (r34607)
+++ lyx-devel/branches/BRANCH_1_6_X/src/mathed/InsetMathBig.cpp Sun Jun 6
20:38:35 2010 (r34608)
@@ -46,9 +46,11 @@
{
// order: big Big bigg Bigg biggg Biggg
// 0 1 2 3 4 5
+ char_type const c = name_[name_.size() - 1];
+ int const base_size = (c == 'l' || c == 'm' || c == 'r') ? 4 : 3;
return name_[0] == 'B' ?
- 2 * (name_.size() - 4) + 1:
- 2 * (name_.size() - 4);
+ 2 * (name_.size() - base_size) + 1:
+ 2 * (name_.size() - base_size);
}
@@ -114,7 +116,7 @@
static char const * const delimiters[] = {
"(", ")", "\\{", "\\}", "\\lbrace", "\\rbrace", "[", "]",
"|", "/", "\\slash", "\\|", "\\vert", "\\Vert", "'",
- "\\\\", "\\backslash",
+ "<", ">", "\\\\", "\\backslash",
"\\langle", "\\lceil", "\\lfloor",
"\\rangle", "\\rceil", "\\rfloor",
"\\downarrow", "\\Downarrow",
Modified: lyx-devel/branches/BRANCH_1_6_X/src/mathed/MathSupport.cpp
==============================================================================
--- lyx-devel/branches/BRANCH_1_6_X/src/mathed/MathSupport.cpp Sun Jun 6
20:11:15 2010 (r34607)
+++ lyx-devel/branches/BRANCH_1_6_X/src/mathed/MathSupport.cpp Sun Jun 6
20:38:35 2010 (r34608)
@@ -295,6 +295,8 @@
{"vert", vert, 0 },
{"Vert", Vert, 0 },
{"'", slash, 1 },
+ {"<", angle, 0 },
+ {">", angle, 2 },
{"\\", slash, 1 },
{"backslash", slash, 1 },
{"langle", angle, 0 },
Modified: lyx-devel/branches/BRANCH_1_6_X/status.16x
==============================================================================
--- lyx-devel/branches/BRANCH_1_6_X/status.16x Sun Jun 6 20:11:15 2010
(r34607)
+++ lyx-devel/branches/BRANCH_1_6_X/status.16x Sun Jun 6 20:38:35 2010
(r34608)
@@ -43,6 +43,9 @@
- Tooltips are added to the outliner (bug 6672, part 2).
+- Add GUI support for big delimiters variants without 'l', 'm' or 'r'
+ endings and for '<' and '>' with all variants.
+
* DOCUMENTATION AND LOCALIZATION
