summaryrefslogtreecommitdiff
path: root/starmath/inc
diff options
context:
space:
mode:
authorOlivier Hallot <olivier.hallot@alta.org.br>2011-11-15 13:34:43 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-11-15 13:35:45 +0000
commitcfc84011b3fb609ac78f35666d9aecda4ca34678 (patch)
tree303c7c54f99f4e6a2ee25d2900cce2d0caa1ecc9 /starmath/inc
parenta1cc4e507cb6547d7715be09bff29366424c09fe (diff)
Fix for fdo#42892: Add new symbols to Math
Diffstat (limited to 'starmath/inc')
-rw-r--r--starmath/inc/helpids.h8
-rw-r--r--starmath/inc/parse.hxx3
-rwxr-xr-xstarmath/inc/starmath.hrc11
-rw-r--r--starmath/inc/types.hxx11
4 files changed, 31 insertions, 2 deletions
diff --git a/starmath/inc/helpids.h b/starmath/inc/helpids.h
index cac2b64c4f80..14221054c4ac 100644
--- a/starmath/inc/helpids.h
+++ b/starmath/inc/helpids.h
@@ -179,6 +179,14 @@
#define HID_SMA_DLARROW "STARMATH_HID_SMA_DLARROW"
#define HID_SMA_DLRARROW "STARMATH_HID_SMA_DLRARROW"
#define HID_SMA_DRARROW "STARMATH_HID_SMA_DRARROW"
+#define HID_SMA_PRECEDES "STARMATH_HID_SMA_PRECEDES"
+#define HID_SMA_PRECEDESEQUAL "STARMATH_HID_SMA_PRECEDESEQUAL"
+#define HID_SMA_PRECEDESEQUIV "STARMATH_HID_SMA_PRECEDESEQUIV"
+#define HID_SMA_SUCCEEDS "STARMATH_HID_SMA_SUCCEEDS"
+#define HID_SMA_SUCCEEDSEQUAL "STARMATH_HID_SMA_SUCCEEDSEQUAL"
+#define HID_SMA_SUCCEEDSEQUIV "STARMATH_HID_SMA_SUCCEEDSEQUIV"
+#define HID_SMA_NOTPRECEDES "STARMATH_HID_SMA_NOTPRECEDES"
+#define HID_SMA_NOTSUCCEEDS "STARMATH_HID_SMA_NOTSUCCEEDS"
#define HID_SMA_MISC_CAT "STARMATH_HID_SMA_MISC_CAT"
#define HID_SMA_UNBINOPS_CAT "STARMATH_HID_SMA_UNBINOPS_CAT"
diff --git a/starmath/inc/parse.hxx b/starmath/inc/parse.hxx
index f4a4973601b0..b8834becb8a3 100644
--- a/starmath/inc/parse.hxx
+++ b/starmath/inc/parse.hxx
@@ -114,7 +114,8 @@ enum SmTokenType
/*210*/ TDIVIDES, TNDIBVIDES, TSETN, TSETZ, TSETQ,
/*215*/ TSETR, TSETC, TWIDEVEC, TWIDETILDE, TWIDEHAT,
/*220*/ TWIDESLASH, TWIDEBACKSLASH, TLDBRACKET, TRDBRACKET, TNOSPACE,
-/*225*/ TUNKNOWN, TDEBUG
+/*225*/ TUNKNOWN, TDEBUG, TPRECEDES, TSUCCEEDS, TPRECEDESEQUAL,
+/*230*/ TSUCCEEDSEQUAL, TPRECEDESEQUIV, TSUCCEEDSEQUIV, TNOTPRECEDES, TNOTSUCCEEDS
};
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index 4d7509bd8dfd..8cc48f4abcea 100755
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -241,6 +241,17 @@
#define RID_DLARROW (RID_APP_START + 1324)
#define RID_DLRARROW (RID_APP_START + 1325)
#define RID_DRARROW (RID_APP_START + 1326)
+// Game theory
+
+#define RID_XPRECEDESY (RID_APP_START + 1327)
+#define RID_XNOTPRECEDESY (RID_APP_START + 1328)
+#define RID_XSUCCEEDSY (RID_APP_START + 1329)
+#define RID_XNOTSUCCEEDSY (RID_APP_START + 1330)
+#define RID_XPRECEDESEQUALY (RID_APP_START + 1331)
+#define RID_XSUCCEEDSEQUALY (RID_APP_START + 1332)
+#define RID_XPRECEDESEQUIVY (RID_APP_START + 1333)
+#define RID_XSUCCEEDSEQUIVY (RID_APP_START + 1334)
+
#define RID_XINY (RID_APP_START + 1401)
#define RID_XNOTINY (RID_APP_START + 1402)
diff --git a/starmath/inc/types.hxx b/starmath/inc/types.hxx
index d3f30d50f20a..fbba0cc8b753 100644
--- a/starmath/inc/types.hxx
+++ b/starmath/inc/types.hxx
@@ -199,7 +199,16 @@ enum MathSymbol
MS_SETR = (sal_Unicode) 0x211D,
MS_SETC = (sal_Unicode) 0x2102,
- MS_PERCENT = (sal_Unicode) 0x0025
+ MS_PERCENT = (sal_Unicode) 0x0025,
+
+ MS_PRECEDES = (sal_Unicode) 0x227A,
+ MS_PRECEDESEQUAL= (sal_Unicode) 0x227C,
+ MS_PRECEDESEQUIV= (sal_Unicode) 0x227E,
+ MS_SUCCEEDS = (sal_Unicode) 0x227B,
+ MS_SUCCEEDSEQUAL= (sal_Unicode) 0x227D,
+ MS_SUCCEEDSEQUIV= (sal_Unicode) 0x227F,
+ MS_NOTPRECEDES = (sal_Unicode) 0x2280,
+ MS_NOTSUCCEEDS = (sal_Unicode) 0x2281,
};
#endif