summaryrefslogtreecommitdiff
path: root/starmath
diff options
context:
space:
mode:
authorJulien Nabet <serval2412@yahoo.fr>2011-09-17 20:36:55 +0200
committerJulien Nabet <serval2412@yahoo.fr>2011-09-17 20:38:27 +0200
commit02d811071cf65aefddac5c3c2a0759d3b673e9a7 (patch)
treed8004f7351b22e8cc577d22aae8835e5c475bd3c /starmath
parentc62fc469aa0539929a5c7f9850fb9ee954fe7198 (diff)
fdo #37007 Add Math symbol "There does not exist".
Diffstat (limited to 'starmath')
-rw-r--r--starmath/inc/helpids.h1
-rw-r--r--starmath/inc/parse.hxx2
-rwxr-xr-xstarmath/inc/starmath.hrc1
-rw-r--r--starmath/inc/types.hxx1
-rw-r--r--starmath/qa/cppunit/test_nodetotextvisitors.cxx1
-rw-r--r--starmath/source/commands.src53
-rw-r--r--starmath/source/mathtype.cxx3
-rw-r--r--starmath/source/parse.cxx2
-rw-r--r--starmath/source/toolbox.src19
9 files changed, 28 insertions, 55 deletions
diff --git a/starmath/inc/helpids.h b/starmath/inc/helpids.h
index f27b47edcdf3..1da4029e7246 100644
--- a/starmath/inc/helpids.h
+++ b/starmath/inc/helpids.h
@@ -160,6 +160,7 @@
#define HID_SMA_LIMINFX "STARMATH_HID_SMA_LIMINFX"
#define HID_SMA_LIMSUPX "STARMATH_HID_SMA_LIMSUPX"
#define HID_SMA_EXISTS "STARMATH_HID_SMA_EXISTS"
+#define HID_SMA_NOTEXISTS "STARMATH_HID_SMA_NOTEXISTS"
#define HID_SMA_FORALL "STARMATH_HID_SMA_FORALL"
#define HID_SMA_NABLA "STARMATH_HID_SMA_NABLA"
#define HID_SMA_INTX "STARMATH_HID_SMA_INTX"
diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx
index 3ad04d123fc7..e4fb34fbd12a 100644
--- a/starmath/inc/parse.hxx
+++ b/starmath/inc/parse.hxx
@@ -97,7 +97,7 @@ enum SmTokenType
/*125*/ TMINUSPLUS, TOPLUS, TOMINUS, TDIV, TOTIMES,
/*130*/ TODIVIDE, TTRANSL, TTRANSR, TIINT, TIIINT,
/*135*/ TLINT, TLLINT, TLLLINT, TPROD, TCOPROD,
-/*140*/ TFORALL, TEXISTS, TLIM, TNABLA, TTOWARD,
+/*140*/ TFORALL, TEXISTS, TNOTEXISTS, TLIM, TNABLA, TTOWARD,
/*145*/ TSINH, TCOSH, TTANH, TCOTH, TASIN,
/*150*/ TACOS, TATAN, TLN, TLOG, TUOPER,
/*155*/ TBOPER, TBLACK, TWHITE, TRED, TGREEN,
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index f7aa0f21f03f..4d7509bd8dfd 100755
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -390,6 +390,7 @@
#define RID_UPARROW (RID_APP_START + 2018)
#define RID_DOWNARROW (RID_APP_START + 2019)
#define RID_EXISTS (RID_APP_START + 1608)
+#define RID_NOTEXISTS (RID_APP_START + 1618)
#define RID_FORALL (RID_APP_START + 1612)
// new menue resource ID's
diff --git a/starmath/inc/types.hxx b/starmath/inc/types.hxx
index 8353f6e10299..d3f30d50f20a 100644
--- a/starmath/inc/types.hxx
+++ b/starmath/inc/types.hxx
@@ -120,6 +120,7 @@ enum MathSymbol
MS_IN = (sal_Unicode) 0x2208,
MS_NOTIN = (sal_Unicode) 0x2209,
MS_EXISTS = (sal_Unicode) 0x2203,
+ MS_NOTEXISTS = (sal_Unicode) 0x2204,
MS_BACKEPSILON = (sal_Unicode) 0x220D,
MS_ALEPH = (sal_Unicode) 0x2135,
MS_IM = (sal_Unicode) 0x2111,
diff --git a/starmath/qa/cppunit/test_nodetotextvisitors.cxx b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
index 47f26b89a4f7..c77b893fe0d7 100644
--- a/starmath/qa/cppunit/test_nodetotextvisitors.cxx
+++ b/starmath/qa/cppunit/test_nodetotextvisitors.cxx
@@ -355,6 +355,7 @@ void Test::SimpleMisc()
parseandparseagain("partial", "Partial");
parseandparseagain("nabla", "Nabla");
parseandparseagain("exists", "There exists");
+ parseandparseagain("notexists", "There not exists");
parseandparseagain("forall", "For all");
parseandparseagain("hbar", "H bar");
parseandparseagain("lambdabar", "Lambda bar");
diff --git a/starmath/source/commands.src b/starmath/source/commands.src
index 9d618bbd0cf3..150f0df36aea 100644
--- a/starmath/source/commands.src
+++ b/starmath/source/commands.src
@@ -119,6 +119,7 @@ String RID_LIMX { Text = "lim <?> " ; };
String RID_LIMINFX { Text = "liminf <?> " ; };
String RID_LIMSUPX { Text = "limsup <?> " ; };
String RID_EXISTS { Text = "exists " ; };
+String RID_NOTEXISTS { Text = "notexists " ; };
String RID_FORALL { Text = "forall " ; };
String RID_INTX { Text = "int <?> " ; };
String RID_IINTX { Text = "iint <?> " ; };
@@ -1410,6 +1411,12 @@ Menu RID_COMMANDMENU
};
MenuItem
{
+ Identifier = RID_NOTEXISTS;
+ HelpId = HID_SMA_NOTEXISTS;
+ Text = "not exists";
+ };
+ MenuItem
+ {
Identifier = RID_FORALL;
HelpId = HID_SMA_FORALL;
Text = "forall";
@@ -1513,49 +1520,3 @@ Menu RID_COMMANDMENU
};
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index c332bbec489b..69d1b0677332 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -342,6 +342,9 @@ sal_Bool MathType::LookupChar(sal_Unicode nChar,String &rRet,sal_uInt8 nVersion,
case 0x2203:
pC = " exists ";
break;
+ case 0x2204:
+ pC = " notexists ";
+ break;
case 0x2205:
pC = " emptyset ";
break;
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 06859cec4a6b..a2f36bf52e55 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -163,6 +163,7 @@ static const SmTokenTableEntry aTokenTable[] =
{ "emptyset" , TEMPTYSET, MS_EMPTYSET, TGSTANDALONE, 5},
{ "equiv", TEQUIV, MS_EQUIV, TGRELATION, 0},
{ "exists", TEXISTS, MS_EXISTS, TGSTANDALONE, 5},
+ { "notexists", TNOTEXISTS, MS_NOTEXISTS, TGSTANDALONE, 5},
{ "exp", TEXP, '\0', TGFUNCTION, 5},
{ "fact", TFACT, MS_FACT, TGUNOPER, 5},
{ "fixed", TFIXED, '\0', TGFONT, 0},
@@ -1449,6 +1450,7 @@ void SmParser::Term()
case TEMPTYSET :
case TINFINITY :
case TEXISTS :
+ case TNOTEXISTS :
case TFORALL :
case TPARTIAL :
case TNABLA :
diff --git a/starmath/source/toolbox.src b/starmath/source/toolbox.src
index 07e728f1e6cb..f493e104448a 100644
--- a/starmath/source/toolbox.src
+++ b/starmath/source/toolbox.src
@@ -1339,18 +1339,18 @@ FloatingWindow RID_TOOLBOXWINDOW
};
ToolBoxItem
{
- Identifier = RID_NABLA ;
- HelpId = HID_SMA_NABLA ;
- Text [ en-US ] = "Nabla";
- };
- ToolBoxItem
- {
Identifier = RID_EXISTS ;
HelpId = HID_SMA_EXISTS ;
Text [ en-US ] = "There Exists";
};
ToolBoxItem
{
+ Identifier = RID_NOTEXISTS ;
+ HelpId = HID_SMA_NOTEXISTS ;
+ Text [ en-US ] = "There Not Exists";
+ };
+ ToolBoxItem
+ {
Identifier = RID_FORALL ;
HelpId = HID_SMA_FORALL ;
Text [ en-US ] = "For All";
@@ -1419,7 +1419,9 @@ FloatingWindow RID_TOOLBOXWINDOW
};
ToolBoxItem
{
- Type = TOOLBOXITEM_SPACE ;
+ Identifier = RID_NABLA ;
+ HelpId = HID_SMA_NABLA ;
+ Text [ en-US ] = "Nabla";
};
ToolBoxItem
{
@@ -1726,6 +1728,7 @@ FloatingWindow RID_TOOLBOXWINDOW
RID_PARTIAL ; \
RID_NABLA ; \
RID_EXISTS ; \
+ RID_NOTEXISTS ; \
RID_FORALL ; \
RID_HBAR; \
RID_LAMBDABAR ; \
@@ -1742,7 +1745,7 @@ FloatingWindow RID_TOOLBOXWINDOW
RID_DOTSUP ; \
RID_DOTSDOWN ; \
}; \
- IdCount = { 19 ; };
+ IdCount = { 20 ; };
ImageList RID_IL_MISC
{