From 2019a3e590ec66fde4947fe4e030355ebba476a0 Mon Sep 17 00:00:00 2001 From: Georg Baum Date: Mon, 26 Jun 2006 16:38:11 +0000 Subject: [PATCH] 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/branches/BRANCH_1_4_X@14230 a592a061-630c-0410-9148-cb99ea01b6c8 --- lib/symbols | 2 ++ src/mathed/math_scriptinset.C | 8 ++++++-- status.14x | 3 +++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/lib/symbols b/lib/symbols index 870555b25d..a812911158 100644 --- a/lib/symbols +++ b/lib/symbols @@ -214,12 +214,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 d7fba5cbc7..a630197701 100644 --- 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; diff --git a/status.14x b/status.14x index 9cf788ab14..f3b4100a18 100644 --- a/status.14x +++ b/status.14x @@ -46,6 +46,9 @@ What's new - Add tgif->ppm and tgif->png converters for preview of tgif figures +- Native support for \intop and \ointop (only display, not in the math panel + yet) + ** Bug fixes * Document input/output: