diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2017-03-17 17:39:16 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2017-03-17 23:27:06 +0000 |
commit | c5f25a3835b9fa4ad4295fa3e6212bbc2311e23f (patch) | |
tree | 51411b61d1ff037477e3dfb8a9a81d98fb9fb080 /starmath | |
parent | cd6b70497180dbf0f3f78684e74702c993bbe449 (diff) |
starmath: Add missing commands and tooltips to the Element window
This partially reverts f645294d3959ab204ac0efb6619e74b5ba85efa6 thankfully,
which told me which help entries were broken or lost.
Change-Id: Id5a4e064aef32d32aed94fbccb0190d514f03c85
Reviewed-on: https://gerrit.libreoffice.org/35318
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Takeshi Abe <tabe@fixedpoint.jp>
Diffstat (limited to 'starmath')
-rw-r--r-- | starmath/inc/starmath.hrc | 39 | ||||
-rw-r--r-- | starmath/source/ElementsDockingWindow.cxx | 26 | ||||
-rw-r--r-- | starmath/source/commands.src | 91 |
3 files changed, 146 insertions, 10 deletions
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc index 5de6d579cfd1..b897ed25ff09 100644 --- a/starmath/inc/starmath.hrc +++ b/starmath/inc/starmath.hrc @@ -156,6 +156,10 @@ #define RID_NEGX (RID_APP_START + 1213) #define RID_XANDY (RID_APP_START + 1214) #define RID_XORY (RID_APP_START + 1215) +#define RID_XODIVIDEY (RID_APP_START + 1216) +#define RID_XODOTY (RID_APP_START + 1217) +#define RID_XOMINUSY (RID_APP_START + 1218) +#define RID_XOPLUSY (RID_APP_START + 1219) #define RID_XOTIMESY (RID_APP_START + 1220) #define RID_XCIRCY (RID_APP_START + 1221) #define RID_XWIDESLASHY (RID_APP_START + 1222) @@ -179,6 +183,9 @@ #define RID_XTOWARDY (RID_APP_START + 1316) #define RID_XLLY (RID_APP_START + 1317) #define RID_XGGY (RID_APP_START + 1318) +#define RID_XDEFY (RID_APP_START + 1319) +#define RID_XTRANSLY (RID_APP_START + 1320) +#define RID_XTRANSRY (RID_APP_START + 1321) #define RID_XDIVIDESY (RID_APP_START + 1322) #define RID_XNDIVIDESY (RID_APP_START + 1323) #define RID_DLARROW (RID_APP_START + 1324) @@ -209,8 +216,13 @@ #define RID_XDIVY_HELP (RID_APP_START + 1345) #define RID_XSYMDIVIDEY_HELP (RID_APP_START + 1346) #define RID_NEGX_HELP (RID_APP_START + 1347) +// blank: 1348 - 1357 #define RID_XANDY_HELP (RID_APP_START + 1358) -#define RID_XORY_HELP (RID_APP_START + 1350) +#define RID_XORY_HELP (RID_APP_START + 1359) +#define RID_XODIVIDEY_HELP (RID_APP_START + 1360) +#define RID_XODOTY_HELP (RID_APP_START + 1361) +#define RID_XOMINUSY_HELP (RID_APP_START + 1362) +#define RID_XOPLUSY_HELP (RID_APP_START + 1363) #define RID_XOTIMESY_HELP (RID_APP_START + 1364) #define RID_XCIRCY_HELP (RID_APP_START + 1365) #define RID_XWIDESLASHY_HELP (RID_APP_START + 1366) @@ -308,6 +320,8 @@ #define RID_FROMXTOY (RID_APP_START + 1613) #define RID_FROMX (RID_APP_START + 1614) #define RID_TOX (RID_APP_START + 1615) +#define RID_LIMINFX (RID_APP_START + 1616) +#define RID_LIMSUPX (RID_APP_START + 1617) #define RID_LIM_FROMX (RID_APP_START + 1621) #define RID_SUM_FROMX (RID_APP_START + 1622) @@ -319,6 +333,8 @@ #define RID_LINT_FROMX (RID_APP_START + 1629) #define RID_LLINT_FROMX (RID_APP_START + 1630) #define RID_LLLINT_FROMX (RID_APP_START + 1631) +#define RID_LIMINF_FROMX (RID_APP_START + 1632) +#define RID_LIMSUP_FROMX (RID_APP_START + 1633) #define RID_LIM_TOX (RID_APP_START + 1641) #define RID_SUM_TOX (RID_APP_START + 1642) @@ -330,6 +346,8 @@ #define RID_LINT_TOX (RID_APP_START + 1649) #define RID_LLINT_TOX (RID_APP_START + 1650) #define RID_LLLINT_TOX (RID_APP_START + 1651) +#define RID_LIMINF_TOX (RID_APP_START + 1652) +#define RID_LIMSUP_TOX (RID_APP_START + 1653) #define RID_LIM_FROMTOX (RID_APP_START + 1661) #define RID_SUM_FROMTOX (RID_APP_START + 1662) @@ -341,6 +359,8 @@ #define RID_LINT_FROMTOX (RID_APP_START + 1669) #define RID_LLINT_FROMTOX (RID_APP_START + 1670) #define RID_LLLINT_FROMTOX (RID_APP_START + 1671) +#define RID_LIMINF_FROMTOX (RID_APP_START + 1672) +#define RID_LIMSUP_FROMTOX (RID_APP_START + 1673) #define RID_ACUTEX (RID_APP_START + 1701) #define RID_GRAVEX (RID_APP_START + 1702) @@ -493,6 +513,9 @@ #define RID_XTOWARDY_HELP (RID_APP_START + 4026) #define RID_XLLY_HELP (RID_APP_START + 4027) #define RID_XGGY_HELP (RID_APP_START + 4028) +#define RID_XDEFY_HELP (RID_APP_START + 4029) +#define RID_XTRANSLY_HELP (RID_APP_START + 4030) +#define RID_XTRANSRY_HELP (RID_APP_START + 4031) #define RID_XDIVIDESY_HELP (RID_APP_START + 4032) #define RID_XNDIVIDESY_HELP (RID_APP_START + 4033) #define RID_DLARROW_HELP (RID_APP_START + 4034) @@ -531,6 +554,7 @@ #define RID_SLRLINEX_HELP (RID_APP_START + 4067) #define RID_SLRDLINEX_HELP (RID_APP_START + 4068) #define RID_LRCEILX_HELP (RID_APP_START + 4069) +// blank: 4070 #define RID_LRFLOORX_HELP (RID_APP_START + 4071) #define RID_SLRCEILX_HELP (RID_APP_START + 4072) #define RID_SLRFLOORX_HELP (RID_APP_START + 4073) @@ -613,6 +637,9 @@ #define RID_IINTX_HELP (RID_APP_START + 4151) #define RID_IIINTX_HELP (RID_APP_START + 4152) #define RID_LINTX_HELP (RID_APP_START + 4153) +#define RID_LLINTX_HELP (RID_APP_START + 4154) +#define RID_LLLINTX_HELP (RID_APP_START + 4155) +// blank: 4156 - 4160 #define RID_LIM_FROMX_HELP (RID_APP_START + 4161) #define RID_SUM_FROMX_HELP (RID_APP_START + 4162) #define RID_PROD_FROMX_HELP (RID_APP_START + 4163) @@ -631,6 +658,8 @@ #define RID_IINT_TOX_HELP (RID_APP_START + 4176) #define RID_IIINT_TOX_HELP (RID_APP_START + 4177) #define RID_LINT_TOX_HELP (RID_APP_START + 4178) +#define RID_LLINT_TOX_HELP (RID_APP_START + 4179) +#define RID_LLLINT_TOX_HELP (RID_APP_START + 4180) #define RID_LIM_FROMTOX_HELP (RID_APP_START + 4181) #define RID_SUM_FROMTOX_HELP (RID_APP_START + 4182) #define RID_PROD_FROMTOX_HELP (RID_APP_START + 4183) @@ -652,6 +681,14 @@ #define RID_COLORX_TEAL_HELP (RID_APP_START + 4200) #define RID_XEVALUATEDATY_HELP (RID_APP_START + 4201) +#define RID_LIMINFX_HELP (RID_APP_START + 4202) +#define RID_LIMINF_FROMX_HELP (RID_APP_START + 4203) +#define RID_LIMINF_TOX_HELP (RID_APP_START + 4204) +#define RID_LIMINF_FROMTOX_HELP (RID_APP_START + 4205) +#define RID_LIMSUPX_HELP (RID_APP_START + 4206) +#define RID_LIMSUP_FROMX_HELP (RID_APP_START + 4207) +#define RID_LIMSUP_TOX_HELP (RID_APP_START + 4208) +#define RID_LIMSUP_FROMTOX_HELP (RID_APP_START + 4209) #define RID_ALIGNLX_HELP (RID_APP_START + 4275) #define RID_ALIGNCX_HELP (RID_APP_START + 4276) diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx index d3e59583a19c..55d4475fa5c9 100644 --- a/starmath/source/ElementsDockingWindow.cxx +++ b/starmath/source/ElementsDockingWindow.cxx @@ -59,11 +59,12 @@ const sal_uInt16 SmElementsControl::aUnaryBinaryOperatorsList[][2] = {0xFFFF, 0}, {RID_XPLUSY, RID_XPLUSY_HELP}, {RID_XMINUSY, RID_XMINUSY_HELP}, {RID_XCDOTY, RID_XCDOTY_HELP}, {RID_XTIMESY, RID_XTIMESY_HELP}, - {RID_XSYMTIMESY, RID_XSYMTIMESY_HELP}, {RID_XOTIMESY, RID_XOTIMESY_HELP}, - {RID_XOVERY, RID_XOVERY_HELP}, + {RID_XSYMTIMESY, RID_XSYMTIMESY_HELP}, {RID_XOVERY, RID_XOVERY_HELP}, {RID_XDIVY, RID_XDIVY_HELP}, {RID_XSYMDIVIDEY, RID_XSYMDIVIDEY_HELP}, - {RID_XCIRCY, RID_XCIRCY_HELP}, {RID_XWIDESLASHY, RID_XWIDESLASHY_HELP}, - {RID_XWIDEBSLASHY, RID_XWIDEBSLASHY_HELP}, + {RID_XOPLUSY, RID_XOPLUSY_HELP}, {RID_XOMINUSY, RID_XOMINUSY_HELP}, + {RID_XODOTY, RID_XODOTY_HELP}, {RID_XOTIMESY, RID_XOTIMESY_HELP}, + {RID_XODIVIDEY, RID_XODIVIDEY_HELP}, {RID_XCIRCY, RID_XCIRCY_HELP}, + {RID_XWIDESLASHY, RID_XWIDESLASHY_HELP}, {RID_XWIDEBSLASHY, RID_XWIDEBSLASHY_HELP}, {0xFFFF, 0}, {RID_NEGX, RID_NEGX_HELP}, {RID_XANDY, RID_XANDY_HELP}, {RID_XORY, RID_XORY_HELP}, }; @@ -78,7 +79,8 @@ const sal_uInt16 SmElementsControl::aRelationsList[][2] = {RID_XAPPROXY, RID_XAPPROXY_HELP}, {RID_XSIMY, RID_XSIMY_HELP}, {RID_XSIMEQY, RID_XSIMEQY_HELP}, {RID_XEQUIVY, RID_XEQUIVY_HELP}, {RID_XPROPY, RID_XPROPY_HELP}, {RID_XPARALLELY, RID_XPARALLELY_HELP}, {RID_XORTHOY, RID_XORTHOY_HELP}, {RID_XDIVIDESY, RID_XDIVIDESY_HELP}, {RID_XNDIVIDESY, RID_XNDIVIDESY_HELP}, - {RID_XTOWARDY, RID_XTOWARDY_HELP}, + {RID_XTOWARDY, RID_XTOWARDY_HELP}, {RID_XTRANSLY, RID_XTRANSLY_HELP}, {RID_XTRANSRY, RID_XTRANSRY_HELP}, + {RID_XDEFY, RID_XDEFY_HELP}, {0xFFFF, 0}, {RID_DLARROW, RID_DLARROW_HELP}, {RID_DLRARROW, RID_DLRARROW_HELP}, {RID_DRARROW, RID_DRARROW_HELP}, {0xFFFF, 0}, @@ -123,6 +125,12 @@ const sal_uInt16 SmElementsControl::aOperators[][2] = {RID_LIMX, RID_LIMX_HELP}, {RID_LIM_FROMX, RID_LIM_FROMX_HELP}, {RID_LIM_TOX, RID_LIM_TOX_HELP}, {RID_LIM_FROMTOX, RID_LIM_FROMTOX_HELP}, {0xFFFF, 0}, + {RID_LIMINFX, RID_LIMINFX_HELP}, {RID_LIMINF_FROMX, RID_LIMINF_FROMX_HELP}, + {RID_LIMINF_TOX, RID_LIM_TOX_HELP}, {RID_LIMINF_FROMTOX, RID_LIMINF_FROMTOX_HELP}, + {0xFFFF, 0}, + {RID_LIMSUPX, RID_LIMSUPX_HELP}, {RID_LIMSUP_FROMX, RID_LIMSUP_FROMX_HELP}, + {RID_LIMSUP_TOX, RID_LIM_TOX_HELP}, {RID_LIMSUP_FROMTOX, RID_LIMSUP_FROMTOX_HELP}, + {0xFFFF, 0}, {RID_SUMX, RID_SUMX_HELP}, {RID_SUM_FROMX, RID_SUM_FROMX_HELP}, {RID_SUM_TOX, RID_SUM_TOX_HELP}, {RID_SUM_FROMTOX, RID_SUM_FROMTOX_HELP}, {0xFFFF, 0}, @@ -144,11 +152,11 @@ const sal_uInt16 SmElementsControl::aOperators[][2] = {RID_LINTX, RID_LINTX_HELP}, {RID_LINT_FROMX, RID_LINT_FROMX_HELP}, {RID_LINT_TOX, RID_LINT_TOX_HELP}, {RID_LINT_FROMTOX, RID_LINT_FROMTOX_HELP}, {0xFFFF, 0}, - {RID_LLINTX, RID_LINTX_HELP}, {RID_LLINT_FROMX, RID_LLINT_FROMX_HELP}, - {RID_LLINT_TOX, RID_LINT_TOX_HELP}, {RID_LLINT_FROMTOX, RID_LLINT_FROMTOX_HELP}, + {RID_LLINTX, RID_LLINTX_HELP}, {RID_LLINT_FROMX, RID_LLINT_FROMX_HELP}, + {RID_LLINT_TOX, RID_LLINT_TOX_HELP}, {RID_LLINT_FROMTOX, RID_LLINT_FROMTOX_HELP}, {0xFFFF, 0}, - {RID_LLLINTX, RID_LINTX_HELP}, {RID_LLLINT_FROMX, RID_LLLINT_FROMX_HELP}, - {RID_LLLINT_TOX, RID_LINT_TOX_HELP}, {RID_LLLINT_FROMTOX, RID_LLLINT_FROMTOX_HELP}, + {RID_LLLINTX, RID_LLLINTX_HELP}, {RID_LLLINT_FROMX, RID_LLLINT_FROMX_HELP}, + {RID_LLLINT_TOX, RID_LLLINT_TOX_HELP}, {RID_LLLINT_FROMTOX, RID_LLLINT_FROMTOX_HELP}, }; const sal_uInt16 SmElementsControl::aAttributes[][2] = diff --git a/starmath/source/commands.src b/starmath/source/commands.src index 0b0b04e86ec7..de9733a884a9 100644 --- a/starmath/source/commands.src +++ b/starmath/source/commands.src @@ -85,6 +85,26 @@ String RID_XOVERY_HELP { Text [ en-US ] = "Division (Fraction)" ; }; +String RID_XODIVIDEY { Text = "<?> odivide <?> " ; }; +String RID_XODIVIDEY_HELP +{ + Text [ en-US ] = "Circled Slash" ; +}; +String RID_XODOTY { Text = "<?> odot <?> " ; }; +String RID_XODOTY_HELP +{ + Text [ en-US ] = "Circled Dot" ; +}; +String RID_XOMINUSY { Text = "<?> ominus <?> " ; }; +String RID_XOMINUSY_HELP +{ + Text [ en-US ] = "Circled Minus" ; +}; +String RID_XOPLUSY { Text = "<?> oplus <?> " ; }; +String RID_XOPLUSY_HELP +{ + Text [ en-US ] = "Circled Plus" ; +}; String RID_XOTIMESY { Text = "<?> otimes <?> " ; }; String RID_XOTIMESY_HELP { @@ -150,6 +170,11 @@ String RID_XGGY_HELP { Text [ en-US ] = "Is Much Greater Than" ; }; +String RID_XDEFY { Text = "<?> def <?> " ; }; +String RID_XDEFY_HELP +{ + Text [ en-US ] = "Is Defined As" ; +}; String RID_XEQUIVY { Text = "<?> equiv <?> " ; }; String RID_XEQUIVY_HELP { @@ -190,6 +215,16 @@ String RID_XTOWARDY_HELP { Text [ en-US ] = "Toward" ; }; +String RID_XTRANSLY { Text = "<?> transl <?> " ; }; +String RID_XTRANSLY_HELP +{ + Text [ en-US ] = "Corresponds To (Left)" ; +}; +String RID_XTRANSRY { Text = "<?> transr <?> " ; }; +String RID_XTRANSRY_HELP +{ + Text [ en-US ] = "Corresponds To (Right)" ; +}; String RID_XINY { Text = "<?> in <?> " ; }; String RID_XINY_HELP { @@ -465,6 +500,46 @@ String RID_LIM_FROMTOX_HELP { Text [ en-US ] = "Limes Sup/Sub script" ; }; +String RID_LIMINFX { Text = "liminf <?> " ; }; +String RID_LIMINFX_HELP +{ + Text [ en-US ] = "Limit Inferior" ; +}; +String RID_LIMINF_FROMX { Text = "liminf from{<?>} <?> " ; }; +String RID_LIMINF_FROMX_HELP +{ + Text [ en-US ] = "Limit Inferior Subscript Bottom" ; +}; +String RID_LIMINF_TOX { Text = "liminf to{<?>} <?> " ; }; +String RID_LIMINF_TOX_HELP +{ + Text [ en-US ] = "Limit Inferior Superscript Top" ; +}; +String RID_LIMINF_FROMTOX { Text = "liminf from{<?>} to{<?>} <?> " ; }; +String RID_LIMINF_FROMTOX_HELP +{ + Text [ en-US ] = "Limit Inferior Sup/Sub script" ; +}; +String RID_LIMSUPX { Text = "limsup <?> " ; }; +String RID_LIMSUPX_HELP +{ + Text [ en-US ] = "Limit Superior" ; +}; +String RID_LIMSUP_FROMX { Text = "limsup from{<?>} <?> " ; }; +String RID_LIMSUP_FROMX_HELP +{ + Text [ en-US ] = "Limit Superior Subscript Bottom" ; +}; +String RID_LIMSUP_TOX { Text = "limsup to{<?>} <?> " ; }; +String RID_LIMSUP_TOX_HELP +{ + Text [ en-US ] = "Limit Superior Superscript Top" ; +}; +String RID_LIMSUP_FROMTOX { Text = "limsup from{<?>} to{<?>} <?> " ; }; +String RID_LIMSUP_FROMTOX_HELP +{ + Text [ en-US ] = "Limit Superior Sup/Sub script" ; +}; String RID_EXISTS { Text = "exists " ; }; String RID_EXISTS_HELP { @@ -561,24 +636,40 @@ String RID_LINT_FROMTOX_HELP Text [ en-US ] = "Curve Integral Sup/Sub script" ; }; String RID_LLINTX { Text = "llint <?> " ; }; +String RID_LLINTX_HELP +{ + Text [ en-US ] = "Double Curve Integral" ; +}; String RID_LLINT_FROMX { Text = "llint from{<?>} <?> " ; }; String RID_LLINT_FROMX_HELP { Text [ en-US ] = "Double Curve Integral Subscript Bottom" ; }; String RID_LLINT_TOX { Text = "llint to{<?>} <?> " ; }; +String RID_LLINT_TOX_HELP +{ + Text [ en-US ] = "Double Curve Integral Superscript Top" ; +}; String RID_LLINT_FROMTOX { Text = "llint from{<?>} to{<?>} <?> " ; }; String RID_LLINT_FROMTOX_HELP { Text [ en-US ] = "Double Curve Integral Sup/Sub script" ; }; String RID_LLLINTX { Text = "lllint <?> " ; }; +String RID_LLLINTX_HELP +{ + Text [ en-US ] = "Triple Curve Integral" ; +}; String RID_LLLINT_FROMX { Text = "lllint from{<?>} <?> " ; }; String RID_LLLINT_FROMX_HELP { Text [ en-US ] = "Triple Curve Integral Subscript Bottom" ; }; String RID_LLLINT_TOX { Text = "lllint to{<?>} <?> " ; }; +String RID_LLLINT_TOX_HELP +{ + Text [ en-US ] = "Triple Curve Integral Superscript Top" ; +}; String RID_LLLINT_FROMTOX { Text = "lllint from{<?>} to{<?>} <?> " ; }; String RID_LLLINT_FROMTOX_HELP { |