diff options
author | Olivier Hallot <olivier.hallot@alta.org.br> | 2011-11-15 13:34:43 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-11-15 13:35:45 +0000 |
commit | cfc84011b3fb609ac78f35666d9aecda4ca34678 (patch) | |
tree | 303c7c54f99f4e6a2ee25d2900cce2d0caa1ecc9 | |
parent | a1cc4e507cb6547d7715be09bff29366424c09fe (diff) |
Fix for fdo#42892: Add new symbols to Math
24 files changed, 504 insertions, 17 deletions
diff --git a/default_images/starmath/res/bi21327.png b/default_images/starmath/res/bi21327.png Binary files differnew file mode 100644 index 000000000000..134c4f5df7b8 --- /dev/null +++ b/default_images/starmath/res/bi21327.png diff --git a/default_images/starmath/res/bi21328.png b/default_images/starmath/res/bi21328.png Binary files differnew file mode 100644 index 000000000000..f16cd7a913a3 --- /dev/null +++ b/default_images/starmath/res/bi21328.png diff --git a/default_images/starmath/res/bi21329.png b/default_images/starmath/res/bi21329.png Binary files differnew file mode 100644 index 000000000000..937e5e086ac9 --- /dev/null +++ b/default_images/starmath/res/bi21329.png diff --git a/default_images/starmath/res/bi21330.png b/default_images/starmath/res/bi21330.png Binary files differnew file mode 100644 index 000000000000..0e28345edcba --- /dev/null +++ b/default_images/starmath/res/bi21330.png diff --git a/default_images/starmath/res/bi21331.png b/default_images/starmath/res/bi21331.png Binary files differnew file mode 100644 index 000000000000..0517f744050b --- /dev/null +++ b/default_images/starmath/res/bi21331.png diff --git a/default_images/starmath/res/bi21332.png b/default_images/starmath/res/bi21332.png Binary files differnew file mode 100644 index 000000000000..97bca2f3d919 --- /dev/null +++ b/default_images/starmath/res/bi21332.png diff --git a/default_images/starmath/res/bi21333.png b/default_images/starmath/res/bi21333.png Binary files differnew file mode 100644 index 000000000000..01488d28a17e --- /dev/null +++ b/default_images/starmath/res/bi21333.png diff --git a/default_images/starmath/res/bi21334.png b/default_images/starmath/res/bi21334.png Binary files differnew file mode 100644 index 000000000000..7a7f138a9deb --- /dev/null +++ b/default_images/starmath/res/bi21334.png diff --git a/extras/source/truetype/symbol/OpenSymbol.sfd b/extras/source/truetype/symbol/OpenSymbol.sfd index e31f894616b5..49b35f1d6af6 100644 --- a/extras/source/truetype/symbol/OpenSymbol.sfd +++ b/extras/source/truetype/symbol/OpenSymbol.sfd @@ -3,8 +3,8 @@ FontName: OpenSymbol FullName: OpenSymbol FamilyName: OpenSymbol Weight: Book -Copyright: (c) 2009 Sun Microsystems Inc.; THERE DOES NOT EXIST (c)\n2011 Julien Nabet -Version: 102.1 +Copyright: (c) 2009 Sun Microsystems Inc.\nTHERE DOES NOT EXIST (c) 2011 Julien Nabet\nPRECEDES <-> DOES NOT SUCCEED (c) 2011 Olivier Hallot +Version: 102.2 ItalicAngle: 0 UnderlinePosition: -143 UnderlineWidth: 20 @@ -19,7 +19,7 @@ OS2Version: 0 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 1 CreationTime: 1144938807 -ModificationTime: 1317319426 +ModificationTime: 1321359108 PfmFamily: 81 TTFWeight: 400 TTFWidth: 5 @@ -773,7 +773,7 @@ ShortTable: maxp 16 0 0 EndShort -LangName: 1033 "" "" "Regular" "OpenSymbol" "" "Version 102.1" +LangName: 1033 "" "" "Regular" "OpenSymbol" "" "Version 102.2" GaspTable: 1 65535 2 Encoding: Custom UnicodeInterp: none @@ -784,7 +784,7 @@ FitToEm: 1 WinInfo: 360 45 15 BeginPrivate: 0 EndPrivate -BeginChars: 993 993 +BeginChars: 1001 1001 StartChar: Alpha Encoding: 909 913 0 @@ -107375,6 +107375,260 @@ SplineSet 862.5 1274.99 l 9,27,-1 758.5 802.99 l 17,24,-1 EndSplineSet +Validated: 1 +EndChar + +StartChar: uni227A +Encoding: 993 8826 993 +Width: 1628 +Flags: W +HStem: -12 21G<1300.5 1387> 495 134<241 540.469> +LayerCount: 2 +Fore +SplineSet +1387 147 m 1,0,-1 + 1387 -12 l 1,1,2 + 1214 218 1214 218 903.5 342.5 c 128,-1,3 + 593 467 593 467 241 495 c 1,4,-1 + 241 629 l 1,5,6 + 592 656 592 656 903 781 c 128,-1,7 + 1214 906 1214 906 1387 1136 c 1,8,-1 + 1387 977 l 1,9,10 + 1316 854 1316 854 1113 737.5 c 128,-1,11 + 910 621 910 621 700 562 c 1,12,13 + 910 502 910 502 1113 386 c 128,-1,14 + 1316 270 1316 270 1387 147 c 1,0,-1 +EndSplineSet +Validated: 1 +EndChar + +StartChar: uni227B +Encoding: 994 8827 994 +Width: 1628 +Flags: W +LayerCount: 2 +Fore +SplineSet +241 167 m 1,0,-1 + 241 8 l 1,1,2 + 414 238 414 238 724.5 362.5 c 128,-1,3 + 1035 487 1035 487 1387 515 c 1,4,-1 + 1387 649 l 1,5,6 + 1036 676 1036 676 725 801 c 128,-1,7 + 414 926 414 926 241 1156 c 1,8,-1 + 241 997 l 1,9,10 + 312 874 312 874 515 757.5 c 128,-1,11 + 718 641 718 641 928 582 c 1,12,13 + 718 522 718 522 515 406 c 128,-1,14 + 312 290 312 290 241 167 c 1,0,-1 +EndSplineSet +Validated: 1 +EndChar + +StartChar: uni227C +Encoding: 995 8828 995 +Width: 1628 +Flags: W +LayerCount: 2 +Fore +SplineSet +1385 153 m 5,0,-1 + 1385 -5 l 5,1,2 + 1213 225 1213 225 903.5 349 c 132,-1,3 + 594 473 594 473 243 500 c 5,4,-1 + 243 635 l 5,5,6 + 594 662 594 662 903.5 786 c 132,-1,7 + 1213 910 1213 910 1385 1139 c 5,8,-1 + 1385 981 l 5,9,10 + 1313 858 1313 858 1111 742.5 c 132,-1,11 + 909 627 909 627 700 567 c 5,12,13 + 909 508 909 508 1111 392 c 132,-1,14 + 1313 276 1313 276 1385 153 c 5,0,-1 +1385 -234 m 5,15,-1 + 1385 -394 l 5,16,17 + 1285 -269 1285 -269 1134 -171.5 c 132,-1,18 + 983 -74 983 -74 820 -21 c 132,-1,19 + 657 32 657 32 515.5 61 c 132,-1,20 + 374 90 374 90 243 98 c 5,21,-1 + 243 233 l 5,22,23 + 544 221 544 221 866 105 c 132,-1,24 + 1188 -11 1188 -11 1385 -234 c 5,15,-1 +EndSplineSet +Validated: 1 +EndChar + +StartChar: uni227D +Encoding: 996 8829 996 +Width: 1628 +Flags: W +LayerCount: 2 +Fore +SplineSet +243 153 m 1,0,-1 + 243 -5 l 1,1,2 + 415 225 415 225 724.5 349 c 128,-1,3 + 1034 473 1034 473 1385 500 c 1,4,-1 + 1385 635 l 1,5,6 + 1034 662 1034 662 724.5 786 c 128,-1,7 + 415 910 415 910 243 1139 c 1,8,-1 + 243 981 l 1,9,10 + 315 858 315 858 517 742.5 c 128,-1,11 + 719 627 719 627 928 567 c 1,12,13 + 719 508 719 508 517 392 c 128,-1,14 + 315 276 315 276 243 153 c 1,0,-1 +243 -234 m 1,15,-1 + 243 -394 l 1,16,17 + 343 -269 343 -269 494 -171.5 c 128,-1,18 + 645 -74 645 -74 808 -21 c 128,-1,19 + 971 32 971 32 1112.5 61 c 128,-1,20 + 1254 90 1254 90 1385 98 c 1,21,-1 + 1385 233 l 1,22,23 + 1084 221 1084 221 762 105 c 128,-1,24 + 440 -11 440 -11 243 -234 c 1,15,-1 +EndSplineSet +Validated: 1 +EndChar + +StartChar: uni227E +Encoding: 997 8830 997 +Width: 1628 +Flags: W +LayerCount: 2 +Fore +SplineSet +1355 150 m 5,0,-1 + 1355 0 l 5,1,2 + 1191 218 1191 218 896.5 336.5 c 132,-1,3 + 602 455 602 455 269 480 c 5,4,-1 + 269 609 l 5,5,6 + 602 634 602 634 896.5 752 c 132,-1,7 + 1191 870 1191 870 1355 1088 c 5,8,-1 + 1355 938 l 5,9,10 + 1287 821 1287 821 1095 711 c 132,-1,11 + 903 601 903 601 704 544 c 5,12,13 + 903 487 903 487 1095 377 c 132,-1,14 + 1287 267 1287 267 1355 150 c 5,0,-1 +1324 -109 m 5,15,-1 + 1388 -109 l 5,16,17 + 1378 -253 1378 -253 1294.5 -380 c 132,-1,18 + 1211 -507 1211 -507 1080 -507 c 4,19,20 + 1000 -507 1000 -507 896 -444.5 c 132,-1,21 + 792 -382 792 -382 696 -319.5 c 132,-1,22 + 600 -257 600 -257 544 -257 c 4,23,24 + 448 -257 448 -257 389.5 -333 c 132,-1,25 + 331 -409 331 -409 304 -526 c 5,26,-1 + 240 -526 l 5,27,28 + 248 -368 248 -368 334.5 -248.5 c 132,-1,29 + 421 -129 421 -129 558 -129 c 4,30,31 + 638 -129 638 -129 742 -191 c 132,-1,32 + 846 -253 846 -253 941.5 -315.5 c 132,-1,33 + 1037 -378 1037 -378 1096 -378 c 4,34,35 + 1267 -378 1267 -378 1324 -109 c 5,15,-1 +EndSplineSet +Validated: 1 +EndChar + +StartChar: uni227F +Encoding: 998 8831 998 +Width: 1628 +Flags: W +LayerCount: 2 +Fore +SplineSet +273 150 m 5,0,-1 + 273 0 l 5,1,2 + 437 218 437 218 731.5 336.5 c 132,-1,3 + 1026 455 1026 455 1359 480 c 5,4,-1 + 1359 609 l 5,5,6 + 1026 634 1026 634 731.5 752 c 132,-1,7 + 437 870 437 870 273 1088 c 5,8,-1 + 273 938 l 5,9,10 + 341 821 341 821 533 711 c 132,-1,11 + 725 601 725 601 924 544 c 5,12,13 + 725 487 725 487 533 377 c 132,-1,14 + 341 267 341 267 273 150 c 5,0,-1 +304 -109 m 5,15,-1 + 240 -109 l 5,16,17 + 250 -253 250 -253 333.5 -380 c 132,-1,18 + 417 -507 417 -507 548 -507 c 4,19,20 + 628 -507 628 -507 732 -444.5 c 132,-1,21 + 836 -382 836 -382 932 -319.5 c 132,-1,22 + 1028 -257 1028 -257 1084 -257 c 4,23,24 + 1180 -257 1180 -257 1238.5 -333 c 132,-1,25 + 1297 -409 1297 -409 1324 -526 c 5,26,-1 + 1388 -526 l 5,27,28 + 1380 -368 1380 -368 1293.5 -248.5 c 132,-1,29 + 1207 -129 1207 -129 1070 -129 c 4,30,31 + 990 -129 990 -129 886 -191 c 132,-1,32 + 782 -253 782 -253 686.5 -315.5 c 132,-1,33 + 591 -378 591 -378 532 -378 c 4,34,35 + 361 -378 361 -378 304 -109 c 5,15,-1 +EndSplineSet +Validated: 1 +EndChar + +StartChar: uni2280 +Encoding: 999 8832 999 +Width: 1628 +Flags: W +LayerCount: 2 +Fore +SplineSet +1382 157 m 5,0,-1 + 1382 0 l 5,1,2 + 1213 226 1213 226 878 361 c 5,3,-1 + 625 -265 l 5,4,-1 + 515 -265 l 5,5,-1 + 782 396 l 5,6,7 + 537 478 537 478 246 502 c 5,8,-1 + 246 636 l 5,9,10 + 648 669 648 669 950 808 c 5,11,-1 + 1192 1403 l 5,12,-1 + 1303 1403 l 5,13,-1 + 1090 881 l 5,14,15 + 1274 991 1274 991 1382 1138 c 5,16,-1 + 1382 981 l 5,17,18 + 1292 828 1292 828 1013 691 c 5,19,-1 + 929 485 l 5,20,21 + 1280 330 1280 330 1382 157 c 5,0,-1 +835 524 m 5,22,-1 + 878 630 l 5,23,24 + 794 597 794 597 701 569 c 5,25,26 + 731 561 731 561 835 524 c 5,22,-1 +EndSplineSet +Validated: 1 +EndChar + +StartChar: uni2281 +Encoding: 1000 8833 1000 +Width: 1628 +Flags: W +LayerCount: 2 +Fore +SplineSet +1385 640 m 5,0,-1 + 1385 504 l 5,1,2 + 987 473 987 473 680 332 c 5,3,-1 + 436 -266 l 5,4,-1 + 325 -266 l 5,5,-1 + 538 258 l 5,6,7 + 354 147 354 147 243 0 c 5,8,-1 + 243 158 l 5,9,10 + 331 310 331 310 616 449 c 5,11,-1 + 698 654 l 5,12,13 + 339 814 339 814 243 986 c 5,14,-1 + 243 1144 l 5,15,16 + 413 914 413 914 749 779 c 5,17,-1 + 1006 1410 l 5,18,-1 + 1116 1410 l 5,19,-1 + 846 744 l 5,20,21 + 1108 658 1108 658 1385 640 c 5,0,-1 +795 615 m 5,22,-1 + 751 511 l 5,23,24 + 841 546 841 546 928 572 c 5,25,26 + 859 592 859 592 795 615 c 5,22,-1 +EndSplineSet +Validated: 1 EndChar EndChars EndSplineFont diff --git a/extras/source/truetype/symbol/opens___.ttf b/extras/source/truetype/symbol/opens___.ttf Binary files differindex 2ce2a08b7232..52b49ca555db 100644 --- a/extras/source/truetype/symbol/opens___.ttf +++ b/extras/source/truetype/symbol/opens___.ttf 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 diff --git a/starmath/source/commands.src b/starmath/source/commands.src index 150f0df36aea..c3834f701385 100644 --- a/starmath/source/commands.src +++ b/starmath/source/commands.src @@ -226,7 +226,14 @@ String RID_UPARROW { Text = "uparrow " ; }; String RID_DOWNARROW { Text = "downarrow " ; }; String RID_NOSPACE { Text = "nospace {<?>} " ; }; - +String RID_XPRECEDESY { Text = "<?> prec <?> " ; }; +String RID_XPRECEDESEQUALY { Text = "<?> preccurlyeq <?> " ; }; +String RID_XPRECEDESEQUIVY { Text = "<?> precsim <?> " ; }; +String RID_XSUCCEEDSY { Text = "<?> succ <?> " ; }; +String RID_XSUCCEEDSEQUALY { Text = "<?> succcurlyeq <?> " ; }; +String RID_XSUCCEEDSEQUIVY { Text = "<?> succsim <?> " ; }; +String RID_XNOTPRECEDESY { Text = "<?> nprec <?> " ; }; +String RID_XNOTSUCCEEDSY { Text = "<?> nsucc <?> " ; }; ////////////////////////////////////////// @@ -509,6 +516,58 @@ Menu RID_COMMANDMENU HelpId = HID_SMA_DRARROW; Text = "a drarrow b"; }; + MenuItem + { + Separator = TRUE; + }; + MenuItem + { + Identifier = RID_XPRECEDESY; + HelpId = HID_SMA_PRECEDES; + Text = "a prec b"; + }; + MenuItem + { + Identifier = RID_XSUCCEEDSY; + HelpId = HID_SMA_SUCCEEDS; + Text = "a succ b"; + }; + MenuItem + { + Identifier = RID_XPRECEDESEQUALY; + HelpId = HID_SMA_PRECEDESEQUAL; + Text = "a preccurlyeq b"; + }; + MenuItem + { + Identifier = RID_XSUCCEEDSEQUALY; + HelpId = HID_SMA_SUCCEEDSEQUAL; + Text = "a succcurlyeq b"; + }; + MenuItem + { + Identifier = RID_XPRECEDESEQUIVY; + HelpId = HID_SMA_PRECEDESEQUIV; + Text = "a precsim b"; + }; + MenuItem + { + Identifier = RID_XSUCCEEDSEQUIVY; + HelpId = HID_SMA_SUCCEEDSEQUIV; + Text = "a succsim b"; + }; + MenuItem + { + Identifier = RID_XNOTPRECEDESY; + HelpId = HID_SMA_NOTPRECEDES; + Text = "a nprec b"; + }; + MenuItem + { + Identifier = RID_XNOTSUCCEEDSY; + HelpId = HID_SMA_NOTSUCCEEDS; + Text = "a nsucc b"; + }; }; }; }; diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx index 69d1b0677332..785a391f72d5 100644 --- a/starmath/source/mathtype.cxx +++ b/starmath/source/mathtype.cxx @@ -435,6 +435,32 @@ sal_Bool MathType::LookupChar(sal_Unicode nChar,String &rRet,sal_uInt8 nVersion, case 0x2265: pC = " >= "; break; + + case 0x227A: + pC = " prec "; + break; + case 0x227B: + pC = " succ "; + break; + case 0x227C: + pC = " preccurlyeq "; + break; + case 0x227D: + pC = " succcurlyeq "; + break; + case 0x227E: + pC = " precsim "; + break; + case 0x227F: + pC = " succsim "; + break; + case 0x2280: + pC = " nprec "; + break; + case 0x2281: + pC = " nsucc "; + break; + case 0x2282: pC = " subset "; break; @@ -459,8 +485,6 @@ sal_Bool MathType::LookupChar(sal_Unicode nChar,String &rRet,sal_uInt8 nVersion, case 0x2289: pC = " nsupseteq "; break; - case 0x227a: - case 0x227b: case 0x22b2: case 0x22b3: rRet += ' '; diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx index a2f36bf52e55..efe10220283b 100644 --- a/starmath/source/parse.cxx +++ b/starmath/source/parse.cxx @@ -249,6 +249,10 @@ static const SmTokenTableEntry aTokenTable[] = { "partial", TPARTIAL, MS_PARTIAL, TGSTANDALONE, 5 }, { "phantom", TPHANTOM, '\0', TGFONTATTR, 5}, { "plusminus", TPLUSMINUS, MS_PLUSMINUS, TGUNOPER | TGSUM, 5}, + { "prec", TPRECEDES, MS_PRECEDES, TGRELATION, 0 }, + { "preccurlyeq", TPRECEDESEQUAL, MS_PRECEDESEQUAL, TGRELATION, 0 }, + { "precsim", TPRECEDESEQUIV, MS_PRECEDESEQUIV, TGRELATION, 0 }, + { "nprec", TNOTPRECEDES, MS_NOTPRECEDES, TGRELATION, 0 }, { "prod", TPROD, MS_PROD, TGOPER, 5}, { "prop", TPROP, MS_PROP, TGRELATION, 0}, { "rangle", TRANGLE, MS_RANGLE, TGRBRACES, 0}, //! 0 to terminate expression @@ -281,6 +285,10 @@ static const SmTokenTableEntry aTokenTable[] = { "stack", TSTACK, '\0', 0, 5}, { "sub", TRSUB, '\0', TGPOWER, 0}, { "subset", TSUBSET, MS_SUBSET, TGRELATION, 0}, + { "succ", TSUCCEEDS, MS_SUCCEEDS, TGRELATION, 0 }, + { "succcurlyeq", TSUCCEEDSEQUAL, MS_SUCCEEDSEQUAL, TGRELATION, 0 }, + { "succsim", TSUCCEEDSEQUIV, MS_SUCCEEDSEQUIV, TGRELATION, 0 }, + { "nsucc", TNOTSUCCEEDS, MS_NOTSUCCEEDS, TGRELATION, 0 }, { "subseteq", TSUBSETEQ, MS_SUBSETEQ, TGRELATION, 0}, { "sum", TSUM, MS_SUM, TGOPER, 5}, { "sup", TRSUP, '\0', TGPOWER, 0}, diff --git a/starmath/source/toolbox.cxx b/starmath/source/toolbox.cxx index 68e15f6079d0..36c28e27f06d 100644 --- a/starmath/source/toolbox.cxx +++ b/starmath/source/toolbox.cxx @@ -238,7 +238,7 @@ void SmToolBoxWindow::StateChanged( StateChangedType nStateChange ) void SmToolBoxWindow::AdjustPosSize( bool bSetPos ) { Size aCatSize( aToolBoxCat.CalcWindowSizePixel( 2 ) ); - Size aCmdSize( pToolBoxCmd->CalcWindowSizePixel( 5 /* see nLines in SetCategory*/ ) ); + Size aCmdSize( pToolBoxCmd->CalcWindowSizePixel( 7 /* see nLines in SetCategory*/ ) ); OSL_ENSURE( aCatSize.Width() == aCmdSize.Width(), "width mismatch" ); // catalog settings @@ -307,7 +307,7 @@ void SmToolBoxWindow::SetCategory(sal_uInt16 nCategoryRID) switch (nCategoryRID) { case RID_UNBINOPS_CAT : nLines = 4; break; - case RID_RELATIONS_CAT: nLines = 5; break; + case RID_RELATIONS_CAT: nLines = 7; break; case RID_SETOPERATIONS_CAT: nLines = 5; break; case RID_FUNCTIONS_CAT: nLines = 5; break; case RID_OPERATORS_CAT: nLines = 3; break; diff --git a/starmath/source/toolbox.src b/starmath/source/toolbox.src index f493e104448a..a83f69f0c0b3 100644 --- a/starmath/source/toolbox.src +++ b/starmath/source/toolbox.src @@ -259,7 +259,7 @@ FloatingWindow RID_TOOLBOXWINDOW Size = MAP_APPFONT ( 65 , 95 ) ; SVLook = TRUE ; Hide = TRUE ; - LineCount = 5 ; + LineCount = 7 ; ItemList = { ToolBoxItem @@ -413,6 +413,62 @@ FloatingWindow RID_TOOLBOXWINDOW HelpId = HID_SMA_DRARROW ; Text [ en-US ] = "Double Arrow Right"; }; + ToolBoxItem + { + Type = TOOLBOXITEM_BREAK ; + }; + ToolBoxItem + { + Identifier = RID_XPRECEDESY ; + HelpId = HID_SMA_PRECEDES ; + Text [ en-US ] = "Precedes"; + }; + ToolBoxItem + { + Identifier = RID_XNOTPRECEDESY ; + HelpId = HID_SMA_NOTPRECEDES ; + Text [ en-US ] = "Not precedes"; + }; + ToolBoxItem + { + Identifier = RID_XSUCCEEDSY ; + HelpId = HID_SMA_SUCCEEDS ; + Text [ en-US ] = "Succeeds"; + }; + ToolBoxItem + { + Identifier = RID_XNOTSUCCEEDSY ; + HelpId = HID_SMA_NOTSUCCEEDS ; + Text [ en-US ] = "Not succeeds"; + }; + ToolBoxItem + { + Type = TOOLBOXITEM_BREAK ; + }; + ToolBoxItem + { + Identifier = RID_XPRECEDESEQUALY ; + HelpId = HID_SMA_PRECEDESEQUAL ; + Text [ en-US ] = "Precedes or equal to"; + }; + ToolBoxItem + { + Identifier = RID_XSUCCEEDSEQUALY ; + HelpId = HID_SMA_SUCCEEDSEQUAL ; + Text [ en-US ] = "Succeeds or equal to"; + }; + ToolBoxItem + { + Identifier = RID_XPRECEDESEQUIVY ; + HelpId = HID_SMA_PRECEDESEQUIV ; + Text [ en-US ] = "Precedes or equivalent to"; + }; + ToolBoxItem + { + Identifier = RID_XSUCCEEDSEQUIVY ; + HelpId = HID_SMA_SUCCEEDSEQUIV ; + Text [ en-US ] = "Succeeds or equivalent to"; + }; }; }; @@ -1516,8 +1572,16 @@ FloatingWindow RID_TOOLBOXWINDOW RID_DLARROW ; \ RID_DLRARROW ; \ RID_DRARROW ; \ + RID_XPRECEDESY ; \ + RID_XNOTPRECEDESY ; \ + RID_XPRECEDESEQUALY ; \ + RID_XPRECEDESEQUIVY ; \ + RID_XSUCCEEDSY ; \ + RID_XNOTSUCCEEDSY ; \ + RID_XSUCCEEDSEQUALY ; \ + RID_XSUCCEEDSEQUIVY ; \ }; \ - IdCount ={ 21 ; }; + IdCount ={ 29 ; }; ImageList RID_IL_RELATIONS { @@ -1728,7 +1792,7 @@ FloatingWindow RID_TOOLBOXWINDOW RID_PARTIAL ; \ RID_NABLA ; \ RID_EXISTS ; \ - RID_NOTEXISTS ; \ + RID_NOTEXISTS ; \ RID_FORALL ; \ RID_HBAR; \ RID_LAMBDABAR ; \ diff --git a/testautomation/framework/optional/input/help_browser/OpenOffice.org_help_topics_en-US.txt b/testautomation/framework/optional/input/help_browser/OpenOffice.org_help_topics_en-US.txt index e90772cf19b8..b02b8fada10a 100755 --- a/testautomation/framework/optional/input/help_browser/OpenOffice.org_help_topics_en-US.txt +++ b/testautomation/framework/optional/input/help_browser/OpenOffice.org_help_topics_en-US.txt @@ -18408,6 +18408,10 @@ OpenOffice.org Math : PostScript;PDF converter, UNIX OpenOffice.org Math : PowerPoint export OpenOffice.org Math : powers OpenOffice.org Math : precision as shown (Calc) +OpenOffice.org Math : precedes symbol +OpenOffice.org Math : not precedes symbol +OpenOffice.org Math : precedes or equal to symbol +OpenOffice.org Math : precedes or equivalent to symbol OpenOffice.org Math : predefining fonts OpenOffice.org Math : presentations OpenOffice.org Math : presentations;creating/opening @@ -18835,6 +18839,10 @@ OpenOffice.org Math : submitting forms OpenOffice.org Math : subscripts OpenOffice.org Math : subset set operators OpenOffice.org Math : subtraction signs +OpenOffice.org Math : succeeds symbol +OpenOffice.org Math : not succeeds symbol +OpenOffice.org Math : succeeds or equal to symbol +OpenOffice.org Math : succeeds or equivalent to symbol OpenOffice.org Math : suffixes in file formats OpenOffice.org Math : sum range example OpenOffice.org Math : summation @@ -18980,7 +18988,7 @@ OpenOffice.org Math : Thai OpenOffice.org Math : Thai;entering text OpenOffice.org Math : Thai;language settings OpenOffice.org Math : there exists symbol -OpenOffice.org Math : there not exists symbol +OpenOffice.org Math : there does not exists symbol OpenOffice.org Math : thesaurus OpenOffice.org Math : thesaurus;activating for a language OpenOffice.org Math : ticker text diff --git a/testautomation/framework/optional/input/help_browser/Oracle_Open_Office_help_topics_en-US.txt b/testautomation/framework/optional/input/help_browser/Oracle_Open_Office_help_topics_en-US.txt index a77cb0ef4242..eeebd893e1bc 100644 --- a/testautomation/framework/optional/input/help_browser/Oracle_Open_Office_help_topics_en-US.txt +++ b/testautomation/framework/optional/input/help_browser/Oracle_Open_Office_help_topics_en-US.txt @@ -15381,6 +15381,10 @@ Oracle Open Office Math : PostScript;PDF converter, UNIX Oracle Open Office Math : PowerPoint export Oracle Open Office Math : powers Oracle Open Office Math : precision as shown (Calc) +Oracle Open Office Math : precedes symbol +Oracle Open Office Math : not precedes symbol +Oracle Open Office Math : precedes or equal to symbol +Oracle Open Office Math : precedes or equivalent to symbol Oracle Open Office Math : predefining fonts Oracle Open Office Math : predictive text, see also AutoCorrect function/AutoFill function/AutoInput function/word completion/text completion Oracle Open Office Math : presentations @@ -15813,6 +15817,10 @@ Oracle Open Office Math : submitting forms Oracle Open Office Math : subscripts Oracle Open Office Math : subset set operators Oracle Open Office Math : subtraction signs +Oracle Open Office Math : succeeds symbol +Oracle Open Office Math : not succeeds symbol +Oracle Open Office Math : succeeds or equal to symbol +Oracle Open Office Math : succeeds or equivalent to symbol Oracle Open Office Math : suffixes in file formats Oracle Open Office Math : sum range example Oracle Open Office Math : summation @@ -15958,7 +15966,7 @@ Oracle Open Office Math : Thai Oracle Open Office Math : Thai;entering text Oracle Open Office Math : Thai;language settings Oracle Open Office Math : there exists symbol -Oracle Open Office Math : there not exists symbol +Oracle Open Office Math : there does not exists symbol Oracle Open Office Math : thesaurus Oracle Open Office Math : thesaurus;activating for a language Oracle Open Office Math : ticker text diff --git a/testautomation/global/win/e_mathop.win b/testautomation/global/win/e_mathop.win index 4fb1ed47a34c..545ccadcfbbe 100644 --- a/testautomation/global/win/e_mathop.win +++ b/testautomation/global/win/e_mathop.win @@ -50,6 +50,14 @@ Toward sym:STARMATH_HID_SMA_XTOWARDY DoubleArrowLeft sym:STARMATH_HID_SMA_DLARROW DoubleArrowLeftAndRight sym:STARMATH_HID_SMA_DLRARROW DoubleArrowRight sym:STARMATH_HID_SMA_DRARROW +Precedes sym:STARMATH_HID_SMA_PRECEDES +Succeeds sym:STARMATH_HID_SMA_SUCCEEDS +NotPrecedes sym:STARMATH_HID_SMA_NOTPRECEDES +NotSucceeds sym:STARMATH_HID_SMA_NOTSUCCEEDS +PrecedesOrEqualTo sym:STARMATH_SMA_PRECEDESEQUAL +SucceedsOrEqualTo sym:STARMATH_SMA_SUCCEEDSEQUAL +PrecedesOrEquivalentTo sym:STARMATH_SMA_PRECEDESEQUIV +SucceedsOrEquivalentTo sym:STARMATH_SMA_SUCCEEDSEQUIV TB_SetOperators sym:STARMATH_HID_SMA_SETOPERATIONS_TBX IsIn sym:STARMATH_HID_SMA_XINY diff --git a/testautomation/global/win/mathop.win b/testautomation/global/win/mathop.win index e1bdac3a825f..9451ceb374f3 100644 --- a/testautomation/global/win/mathop.win +++ b/testautomation/global/win/mathop.win @@ -50,6 +50,14 @@ StrebtGegen sym:STARMATH_HID_SMA_XTOWARDY DoppelterPfeilNachLinks sym:STARMATH_HID_SMA_DLARROW DoppelterPfeilNachLinksUndRechts sym:STARMATH_HID_SMA_DLRARROW DoppelterPfeilNachRechts sym:STARMATH_HID_SMA_DRARROW +Precedes sym:STARMATH_HID_SMA_PRECEDES +Succeeds sym:STARMATH_HID_SMA_SUCCEEDS +NotPrecedes sym:STARMATH_HID_SMA_NOTPRECEDES +NotSucceeds sym:STARMATH_HID_SMA_NOTSUCCEEDS +PrecedesOrEqualTo sym:STARMATH_SMA_PRECEDESEQUAL +SucceedsOrEqualTo sym:STARMATH_SMA_SUCCEEDSEQUAL +PrecedesOrEquivalentTo sym:STARMATH_SMA_PRECEDESEQUIV +SucceedsOrEquivalentTo sym:STARMATH_SMA_SUCCEEDSEQUIV TB_Mengenoperatoren sym:STARMATH_HID_SMA_SETOPERATIONS_TBX IstEnthaltenIn sym:STARMATH_HID_SMA_XINY diff --git a/testautomation/math/required/includes/m_010_.inc b/testautomation/math/required/includes/m_010_.inc index 71e6501b2aec..18430a4c4d75 100644 --- a/testautomation/math/required/includes/m_010_.inc +++ b/testautomation/math/required/includes/m_010_.inc @@ -157,6 +157,23 @@ try Teilt.Click Call Bereinigen TeiltNicht.Click + Call Bereinigen + Precedes.Click + Call Bereinigen + Succeeds.Click + Call Bereinigen + NotPrecedes.Click + Call Bereinigen + NotSucceeds.Click + Call Bereinigen + PrecedesOrEqualTo.Click + Call Bereinigen + SucceedsOrEqualTo.Click + Call Bereinigen + PrecedesOrEquivalentTo.Click + Call Bereinigen + SucceedsOrEquivalentTo.Click + Call Bereinigen catch warnlog "failed!" |