diff options
| author | dante <dante19031999@gmail.com> | 2020-06-22 17:22:49 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-06-24 12:01:02 +0200 |
| commit | e7fee907fa8240c742bd8f6268768d1acad2774f (patch) | |
| tree | 4b887c794fc24d7b8e55508cabedfe83281aeb12 /starmath/inc | |
| parent | 3dcf7a3d221290b290aca4a7f4cb691322873fb6 (diff) | |
Change-Id: Id0791609ada5b9f5460e46b20cfc7ce600cd3043
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96890
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'starmath/inc')
| -rw-r--r-- | starmath/inc/strings.hrc | 3 | ||||
| -rw-r--r-- | starmath/inc/strings.hxx | 2 | ||||
| -rw-r--r-- | starmath/inc/token.hxx | 4 | ||||
| -rw-r--r-- | starmath/inc/types.hxx | 2 |
4 files changed, 10 insertions, 1 deletions
diff --git a/starmath/inc/strings.hrc b/starmath/inc/strings.hrc index f12677d26eca..b4a22c58e546 100644 --- a/starmath/inc/strings.hrc +++ b/starmath/inc/strings.hrc @@ -189,6 +189,7 @@ #define RID_COLORX_SILVER_HELP NC_("RID_COLORX_SILVER_HELP", "Color Silver" ) #define RID_COLORX_TEAL_HELP NC_("RID_COLORX_TEAL_HELP", "Color Teal" ) #define RID_COLORX_YELLOW_HELP NC_("RID_COLORX_YELLOW_HELP", "Color Yellow" ) +#define RID_COLORX_RGB_HELP NC_("RID_COLORX_RGB_HELP", "Color RGB" ) #define RID_LRGROUPX_HELP NC_("RID_LRGROUPX_HELP", "Group Brackets" ) #define RID_LRPARENTX_HELP NC_("RID_LRPARENTX_HELP", "Round Brackets" ) #define RID_LRBRACKETX_HELP NC_("RID_LRBRACKETX_HELP", "Square Brackets" ) @@ -235,6 +236,7 @@ #define RID_INFINITY_HELP NC_("RID_INFINITY_HELP", "Infinity" ) #define RID_PARTIAL_HELP NC_("RID_PARTIAL_HELP", "Partial" ) #define RID_NABLA_HELP NC_("RID_NABLA_HELP", "Nabla" ) +#define RID_LAPLACE_HELP NC_("RID_LAPLACE_HELP", "Laplace" ) #define RID_WP_HELP NC_("RID_WP_HELP", "Weierstrass p" ) #define RID_DOTSAXIS_HELP NC_("RID_DOTSAXIS_HELP", "Dots In Middle" ) #define RID_DOTSUP_HELP NC_("RID_DOTSUP_HELP", "Dots To Top" ) @@ -308,6 +310,7 @@ #define STR_SILVER NC_("STR_SILVER", "silver" ) #define STR_TEAL NC_("STR_TEAL", "teal" ) #define STR_YELLOW NC_("STR_YELLOW", "yellow" ) +#define STR_RGB NC_("STR_RGB", "rgb" ) #define STR_HIDE NC_("STR_HIDE", "hide" ) #define STR_SIZE NC_("STR_SIZE", "size" ) #define STR_FONT NC_("STR_FONT", "font" ) diff --git a/starmath/inc/strings.hxx b/starmath/inc/strings.hxx index ba7826a3dd75..bedd9534716d 100644 --- a/starmath/inc/strings.hxx +++ b/starmath/inc/strings.hxx @@ -182,6 +182,7 @@ #define RID_COLORX_SILVER "color silver {<?>} " #define RID_COLORX_TEAL "color teal {<?>} " #define RID_COLORX_YELLOW "color yellow {<?>} " +#define RID_COLORX_RGB "color rgb 0 0 0 {<?>} " #define RID_LRGROUPX "{<?>} " #define RID_LRPARENTX "(<?>) " #define RID_LRBRACKETX "[<?>] " @@ -229,6 +230,7 @@ #define RID_PARTIAL "partial " #define RID_NABLA "nabla " #define RID_WP "wp " +#define RID_LAPLACE "laplace " #define RID_DOTSAXIS "dotsaxis " #define RID_DOTSUP "dotsup " #define RID_DOTSDOWN "dotsdown " diff --git a/starmath/inc/token.hxx b/starmath/inc/token.hxx index 1bbe446fcca2..cdc91ddf4838 100644 --- a/starmath/inc/token.hxx +++ b/starmath/inc/token.hxx @@ -44,6 +44,7 @@ enum class TG { Limit = 0x010000, FontAttr = 0x020000 }; + namespace o3tl { template<> struct typed_flags<TG> : is_typed_flags<TG, 0x037fff> {}; } @@ -100,7 +101,8 @@ enum SmTokenType TUNKNOWN, TPRECEDES, TSUCCEEDS, TPRECEDESEQUAL, TSUCCEEDSEQUAL, TPRECEDESEQUIV, TSUCCEEDSEQUIV, TNOTPRECEDES, TNOTSUCCEEDS, TSILVER, TGRAY, TMAROON, TPURPLE, TLIME, TOLIVE, - TNAVY, TTEAL, TAQUA, TFUCHSIA, TINTD + TNAVY, TTEAL, TAQUA, TFUCHSIA, TINTD, + TRGB, TLAPLACE }; struct SmToken diff --git a/starmath/inc/types.hxx b/starmath/inc/types.hxx index 5680e907c6e7..044b2fab05d1 100644 --- a/starmath/inc/types.hxx +++ b/starmath/inc/types.hxx @@ -78,6 +78,7 @@ sal_Unicode const MS_DEF = 0x225D; sal_Unicode const MS_EQUIV = 0x2261; sal_Unicode const MS_PROP = 0x221D; sal_Unicode const MS_PARTIAL = 0x2202; +sal_Unicode const MS_LAPLACE = 0x2112; sal_Unicode const MS_SUBSET = 0x2282; sal_Unicode const MS_SUPSET = 0x2283; @@ -179,6 +180,7 @@ sal_Unicode const MS_LEFTARROW = 0x2190; sal_Unicode const MS_UPARROW = 0x2191; sal_Unicode const MS_RIGHTARROW = 0x2192; sal_Unicode const MS_DOWNARROW = 0x2193; + sal_Unicode const MS_SETN = 0x2115; sal_Unicode const MS_SETZ = 0x2124; sal_Unicode const MS_SETQ = 0x211A; |