Fix limit display of intop and ointop

	* src/mathed/math_scriptinset.C
	(MathScriptInset::hasLimits): handle \intop and \ointop

	* lib/symbols: add intop and ointop

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14225 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/symbols b/lib/symbols
index 2d18e9ceafbd3e6f6184da43f3ce87d5cf6df3f2..aab35339230be4ad8162e7dd7d687ad20e55f3f7 100644 (file)
--- a/lib/symbols
+++ b/lib/symbols
@@ -238,12 +238,14 @@ biguplus           cmex         85   0 mathop   x
 bigcap             cmex         84   0 mathop   x
 bigcup             cmex         83   0 mathop   x
 int                cmex         82 242 mathop   ∫
+intop              cmex         82 242 mathop   ∫
 prod               cmex         81 213 mathop   x
 sum                cmex         80 229 mathop   x
 bigotimes          cmex         78   0 mathop   x
 bigoplus           cmex         76   0 mathop   x
 bigodot            cmex         74   0 mathop   x
 oint               cmex         72   0 mathop   x
+ointop             cmex         72   0 mathop   x
 bigsqcup           cmex         70   0 mathop   x
 smallint           cmsy        115   0 mathop   x
 triangleleft       cmm          47   0 mathbin  x

diff --git a/src/mathed/math_scriptinset.C b/src/mathed/math_scriptinset.C
index 573072c28d07ab2a7f32cf3f542c1ea6fc980cc4..3c1797143cabec7f51cbd54a09a1b38613f0d51f 100644 (file)
--- a/src/mathed/math_scriptinset.C
+++ b/src/mathed/math_scriptinset.C
@@ -292,10 +292,14 @@ bool MathScriptInset::hasLimits() const
        if (!nuc().back()->isScriptable())
                return false;
 
-       // per default \int has limits beside the \int even in displayed formulas
-       if (nuc().back()->asSymbolInset())
+       if (nuc().back()->asSymbolInset()) {
+               // \intop is an alias for \int\limits, \ointop == \oint\limits
+               if (nuc().back()->asSymbolInset()->name().find("intop") != string::npos)
+                       return true;
+               // per default \int has limits beside the \int even in displayed formulas
                if (nuc().back()->asSymbolInset()->name().find("int") != string::npos)
                        return false;
+       }
 
        // assume "real" limits for everything else
        return true;