diff options
19 files changed, 343 insertions, 63 deletions
diff --git a/default_images/starmath/res/mi21618.png b/default_images/starmath/res/mi21618.png Binary files differnew file mode 100644 index 000000000000..f93a52973f02 --- /dev/null +++ b/default_images/starmath/res/mi21618.png diff --git a/extras/source/truetype/symbol/OpenSymbol.sfd b/extras/source/truetype/symbol/OpenSymbol.sfd index d7101ea3a855..97905d1a8547 100644 --- a/extras/source/truetype/symbol/OpenSymbol.sfd +++ b/extras/source/truetype/symbol/OpenSymbol.sfd @@ -20,7 +20,7 @@ OS2Version: 0 OS2_WeightWidthSlopeOnly: 0 OS2_UseTypoMetrics: 1 CreationTime: 1144938807 -ModificationTime: 1257779664 +ModificationTime: 1316279011 PfmFamily: 81 TTFWeight: 400 TTFWidth: 5 @@ -714,7 +714,7 @@ MUL SWAP ENDF EndTTInstrs -ShortTable: cvt 38 +ShortTable: cvt 39 0 148 145 @@ -753,6 +753,7 @@ ShortTable: cvt 38 982 1343 1449 + 91 EndShort ShortTable: maxp 16 1 @@ -780,8 +781,8 @@ NameList: Adobe Glyph List DisplaySize: -24 AntiAlias: 1 FitToEm: 1 -WinInfo: 135 45 20 -BeginChars: 992 992 +WinInfo: 360 45 15 +BeginChars: 993 993 StartChar: Alpha Encoding: 909 913 0 @@ -14941,9 +14942,11 @@ HStem: 2 129<117 1034> 670 135<217 1034> 1274 135<117 1034> VStem: 1034 156<131 670 805 1274> TtInstrs: SVTCA[y-axis] -PUSHB_1 +PUSHB_3 0 -MDAP[rnd] + 34 + 0 +CALL PUSHB_1 1 MDRP[min,rnd,black] @@ -15017,7 +15020,7 @@ SplineSet 1190 2 l 1,11,-1 117 2 l 1,0,-1 EndSplineSet -Validated: 1 +Validated: 16385 EndChar StartChar: emptyset @@ -15389,7 +15392,7 @@ SplineSet 387 129 l 1,20,21 145 327 145 327 145 586 c 0,22,23 145 916 145 916 403 1042 c 0,24,25 - 585 1133 585 1133 954 1133 c 1,26,-1 + 585 1133 585 1133 954 1133 c 5,26,-1 1065 1325 l 1,27,-1 1198 1325 l 1,28,-1 1090 1133 l 1,29,-1 @@ -107019,6 +107022,7 @@ SplineSet 631 1483 l 1,5,-1 666 1481 l 1,0,-1 EndSplineSet +Validated: 1 EndChar StartChar: breve @@ -107041,6 +107045,7 @@ SplineSet 220 1346 220 1346 268 1284 c 0,16,17 338 1200 338 1200 467 1200 c 0,0,1 EndSplineSet +Validated: 1 EndChar StartChar: ACUTE @@ -107058,6 +107063,7 @@ SplineSet 342 1456 l 1,3,-1 565 1456 l 1,0,-1 EndSplineSet +Validated: 1 EndChar StartChar: GRAVE @@ -107075,6 +107081,298 @@ SplineSet 412 1130 l 1,3,-1 117 1477 l 1,0,-1 EndSplineSet +Validated: 1 +EndChar + +StartChar: nonexistential +Encoding: 992 8708 992 +Width: 1345 +Flags: HWO +HStem: 2 129<117 478.5 604.389 1034> 670 135<217 635.5 758.5 1034> 1274 135<117 768.5 892.5 1034> +VStem: 1034 156<131 670 805 1274> +TtInstrs: +SVTCA[y-axis] +PUSHB_3 + 1 + 34 + 0 +CALL +PUSHB_2 + 0 + 17 +SHP[rp1] +SHP[rp1] +PUSHB_1 + 2 +MDRP[min,rnd,black] +PUSHB_2 + 3 + 20 +SHP[rp2] +SHP[rp2] +PUSHB_3 + 1 + 2 + 10 +CALL +PUSHB_4 + 64 + 1 + 18 + 9 +CALL +PUSHB_1 + 19 +SHP[rp2] +PUSHB_1 + 5 +MDAP[rnd] +PUSHB_2 + 4 + 23 +SHP[rp1] +SHP[rp1] +PUSHB_1 + 6 +MDRP[min,rnd,black] +PUSHB_2 + 7 + 24 +SHP[rp2] +SHP[rp2] +PUSHB_1 + 9 +MDAP[rnd] +PUSHB_2 + 8 + 27 +SHP[rp1] +SHP[rp1] +PUSHB_1 + 10 +MDRP[min,rnd,black] +PUSHB_2 + 11 + 14 +SHP[rp2] +SHP[rp2] +SVTCA[x-axis] +PUSHB_1 + 28 +MDAP[rnd] +PUSHB_1 + 21 +MDRP[rp0,rnd,white] +PUSHB_1 + 25 +SHP[rp2] +PUSHB_1 + 16 +MDRP[min,rnd,black] +PUSHB_3 + 21 + 16 + 10 +CALL +PUSHB_4 + 64 + 21 + 10 + 9 +CALL +PUSHB_1 + 1 +SHP[rp2] +PUSHB_2 + 29 + 1 +CALL +PUSHB_1 + 54 +SMD +PUSHW_2 + 15997 + -3541 +SPVFS +PUSHB_1 + 19 +MDAP[no-rnd] +SFVTPV +PUSHB_1 + 12 +MDRP[grey] +SFVTCA[x-axis] +PUSHB_2 + 18 + 38 +MIRP[rp0,min,black] +SFVTPV +PUSHB_1 + 13 +MDRP[grey] +SFVTCA[x-axis] +PUSHB_1 + 19 +SRP0 +PUSHB_4 + 0 + 19 + 12 + 19 +CALL +PUSHB_4 + 3 + 19 + 12 + 19 +CALL +PUSHB_4 + 4 + 19 + 12 + 19 +CALL +PUSHB_4 + 7 + 19 + 12 + 19 +CALL +PUSHB_4 + 8 + 19 + 12 + 19 +CALL +PUSHB_4 + 11 + 19 + 12 + 19 +CALL +PUSHB_1 + 18 +SRP0 +PUSHB_4 + 14 + 18 + 13 + 19 +CALL +PUSHB_4 + 17 + 18 + 13 + 19 +CALL +PUSHB_4 + 20 + 18 + 13 + 19 +CALL +PUSHB_4 + 23 + 18 + 13 + 19 +CALL +PUSHB_4 + 24 + 18 + 13 + 19 +CALL +PUSHB_4 + 27 + 18 + 13 + 19 +CALL +SPVTCA[x-axis] +SVTCA[y-axis] +PUSHB_2 + 12 + 13 +MDAP[no-rnd] +MDAP[no-rnd] +SVTCA[x-axis] +NPUSHB + 16 + 0 + 3 + 4 + 7 + 8 + 11 + 12 + 13 + 14 + 17 + 18 + 19 + 20 + 23 + 24 + 27 +MDAP[no-rnd] +MDAP[no-rnd] +MDAP[no-rnd] +MDAP[no-rnd] +MDAP[no-rnd] +MDAP[no-rnd] +MDAP[no-rnd] +MDAP[no-rnd] +MDAP[no-rnd] +MDAP[no-rnd] +MDAP[no-rnd] +MDAP[no-rnd] +MDAP[no-rnd] +MDAP[no-rnd] +MDAP[no-rnd] +MDAP[no-rnd] +PUSHB_1 + 64 +SMD +SVTCA[y-axis] +IUP[y] +IUP[x] +EndTTInstrs +LayerCount: 2 +Fore +SplineSet +436.5 0 m 17,0,-1 + 117 2 l 1,1,-1 + 117 131 l 1,2,-1 + 468.5 133.99 l 9,3,-1 + 593.5 670.99 l 17,4,-1 + 217 670 l 1,5,-1 + 217 805 l 1,6,-1 + 622.5 805.99 l 9,7,-1 + 726.5 1274.99 l 17,8,-1 + 117 1274 l 1,9,-1 + 117 1409 l 1,10,-1 + 756.286 1409 l 9,11,-1 + 787.5 1572.1 l 25,12,-1 + 923.5 1572.1 l 25,13,-1 + 892.5 1410.1 l 17,14,-1 + 1190 1409 l 1,15,-1 + 1190 2 l 1,16,-1 + 572.68 2 l 9,17,-1 + 543.5 -134.01 l 25,18,-1 + 407.5 -134.01 l 29,19,-1 + 436.5 0 l 17,0,-1 +604.389 131 m 17,20,-1 + 1034 131 l 1,21,-1 + 1034 670 l 1,22,-1 + 729.5 670.99 l 9,23,-1 + 604.389 131 l 17,20,-1 +758.5 802.99 m 17,24,-1 + 1034 805 l 1,25,-1 + 1034 1274 l 1,26,-1 + 862.5 1274.99 l 9,27,-1 + 758.5 802.99 l 17,24,-1 +EndSplineSet EndChar EndChars EndSplineFont diff --git a/extras/source/truetype/symbol/opens___.ttf b/extras/source/truetype/symbol/opens___.ttf Binary files differindex 96707f2638a8..589769cee9ad 100644 --- a/extras/source/truetype/symbol/opens___.ttf +++ b/extras/source/truetype/symbol/opens___.ttf diff --git a/ooo_custom_images/hicontrast/starmath/res/mi21618.png b/ooo_custom_images/hicontrast/starmath/res/mi21618.png Binary files differnew file mode 100644 index 000000000000..1289aafeecd7 --- /dev/null +++ b/ooo_custom_images/hicontrast/starmath/res/mi21618.png 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 { diff --git a/svtools/inc/svtools/htmlkywd.hxx b/svtools/inc/svtools/htmlkywd.hxx index 999ee21d236c..37de7daab8b1 100644 --- a/svtools/inc/svtools/htmlkywd.hxx +++ b/svtools/inc/svtools/htmlkywd.hxx @@ -329,6 +329,7 @@ #define OOO_STRING_SVTOOLS_HTML_S_eta "eta" #define OOO_STRING_SVTOOLS_HTML_S_euro "euro" #define OOO_STRING_SVTOOLS_HTML_S_exist "exist" +#define OOO_STRING_SVTOOLS_HTML_S_notexist "not exist" #define OOO_STRING_SVTOOLS_HTML_S_fnof "fnof" #define OOO_STRING_SVTOOLS_HTML_S_forall "forall" #define OOO_STRING_SVTOOLS_HTML_S_frasl "frasl" 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 d523c5e9f256..e3d842d21bba 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 @@ -18987,6 +18987,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 : 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 0db04d4a09e3..30276cebfd71 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 @@ -15964,6 +15964,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 : 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 9beb74b31ebc..4fb1ed47a34c 100644 --- a/testautomation/global/win/e_mathop.win +++ b/testautomation/global/win/e_mathop.win @@ -147,6 +147,7 @@ Infinity sym:STARMATH_HID_SMA_INFINITY Partial sym:STARMATH_HID_SMA_PARTIAL Nabla sym:STARMATH_HID_SMA_NABLA ThereExists sym:STARMATH_HID_SMA_EXISTS +ThereNotExists sym:STARMATH_HID_SMA_NOTEXISTS ForAll sym:STARMATH_HID_SMA_FORALL HBar sym:STARMATH_HID_SMA_HBAR LambdaBar sym:STARMATH_HID_SMA_LAMBDABAR diff --git a/testautomation/global/win/mathop.win b/testautomation/global/win/mathop.win index e4f7d3cf0ba0..e1bdac3a825f 100644 --- a/testautomation/global/win/mathop.win +++ b/testautomation/global/win/mathop.win @@ -147,6 +147,7 @@ Unendlich sym:STARMATH_HID_SMA_INFINITY Partial sym:STARMATH_HID_SMA_PARTIAL Nabla sym:STARMATH_HID_SMA_NABLA EsExistiert sym:STARMATH_HID_SMA_EXISTS +EsNichtExistiert sym:STARMATH_HID_SMA_NOTEXISTS FuerAlle sym:STARMATH_HID_SMA_FORALL HQuer sym:STARMATH_HID_SMA_HBAR LambdaQuer sym:STARMATH_HID_SMA_LAMBDABAR diff --git a/testautomation/math/required/includes/m_010_.inc b/testautomation/math/required/includes/m_010_.inc index 7f3cd8944a50..71e6501b2aec 100644 --- a/testautomation/math/required/includes/m_010_.inc +++ b/testautomation/math/required/includes/m_010_.inc @@ -579,6 +579,10 @@ try inc i Printlog " i: "+i Call Bereinigen + ThereNotExists.Click + inc i + Printlog " i: "+i + Call Bereinigen ForAll.Click inc i Printlog " i: "+i |
