diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2019-05-27 00:12:28 +0900 |
---|---|---|
committer | Takeshi Abe <tabe@fixedpoint.jp> | 2019-06-13 05:11:25 +0200 |
commit | 93eeaf0ad902214fb6b4205606b24046a458ee45 (patch) | |
tree | 8b124795dd6c6aec34e9f6f8886e6a80b7b01086 /starmath/inc | |
parent | 5e6af47dc87a55fea595c952ea3e59c93d0620db (diff) |
tdf#120047 Support attribute harpoon/wideharpoon in Math
... for an alternative style of vectors.
They are vec/widevec analogs but with COMBINING RIGHT HARPOON ABOVE
(U+20D1). The new attribute names are deliberately long in order to
make fewer accidental collisions with variable names in formulae of
exising documents.
This also adds a glyph uni20D1 to OpenSymbol.
Change-Id: I31666e57808aa0e0327500916d3b862549891886
Reviewed-on: https://gerrit.libreoffice.org/72987
Tested-by: Jenkins
Reviewed-by: Takeshi Abe <tabe@fixedpoint.jp>
Diffstat (limited to 'starmath/inc')
-rw-r--r-- | starmath/inc/node.hxx | 2 | ||||
-rw-r--r-- | starmath/inc/strings.hrc | 2 | ||||
-rw-r--r-- | starmath/inc/strings.hxx | 2 | ||||
-rw-r--r-- | starmath/inc/token.hxx | 4 | ||||
-rw-r--r-- | starmath/inc/types.hxx | 1 |
5 files changed, 9 insertions, 2 deletions
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx index da67e9bdece6..73bfb17132c9 100644 --- a/starmath/inc/node.hxx +++ b/starmath/inc/node.hxx @@ -1019,7 +1019,7 @@ public: /** Attribute node * * Used to give an attribute to another node. Used for commands such as: - * UNDERLINE, OVERLINE, OVERSTRIKE, WIDEVEC, WIDEHAT and WIDETILDE. + * UNDERLINE, OVERLINE, OVERSTRIKE, WIDEVEC, WIDEHARPOON, WIDEHAT and WIDETILDE. * * Children:<BR> * 0: Attribute<BR> diff --git a/starmath/inc/strings.hrc b/starmath/inc/strings.hrc index eec600990ba0..f12677d26eca 100644 --- a/starmath/inc/strings.hrc +++ b/starmath/inc/strings.hrc @@ -165,6 +165,7 @@ #define RID_HATX_HELP NC_("RID_HATX_HELP", "Circumflex" ) #define RID_TILDEX_HELP NC_("RID_TILDEX_HELP", "Tilde" ) #define RID_VECX_HELP NC_("RID_VECX_HELP", "Vector Arrow" ) +#define RID_HARPOONX_HELP NC_("RID_HARPOONX_HELP", "Harpoon" ) #define RID_UNDERLINEX_HELP NC_("RID_UNDERLINEX_HELP", "Line Below" ) #define RID_OVERLINEX_HELP NC_("RID_OVERLINEX_HELP", "Line Over" ) #define RID_OVERSTRIKEX_HELP NC_("RID_OVERSTRIKEX_HELP", "Line Through" ) @@ -256,6 +257,7 @@ #define RID_WIDEHATX_HELP NC_("RID_WIDEHATX_HELP", "Large Circumflex" ) #define RID_WIDETILDEX_HELP NC_("RID_WIDETILDEX_HELP", "Large Tilde" ) #define RID_WIDEVECX_HELP NC_("RID_WIDEVECX_HELP", "Large Vector Arrow" ) +#define RID_WIDEHARPOONX_HELP NC_("RID_WIDEHARPOONX_HELP", "Large Harpoon" ) #define RID_HBAR_HELP NC_("RID_HBAR_HELP", "h Bar" ) #define RID_LAMBDABAR_HELP NC_("RID_LAMBDABAR_HELP", "Lambda Bar" ) #define RID_LEFTARROW_HELP NC_("RID_LEFTARROW_HELP", "Left Arrow" ) diff --git a/starmath/inc/strings.hxx b/starmath/inc/strings.hxx index beeb1519730c..ba7826a3dd75 100644 --- a/starmath/inc/strings.hxx +++ b/starmath/inc/strings.hxx @@ -158,6 +158,7 @@ #define RID_HATX "hat <?> " #define RID_TILDEX "tilde <?> " #define RID_VECX "vec <?> " +#define RID_HARPOONX "harpoon <?> " #define RID_UNDERLINEX "underline {<?>} " #define RID_OVERLINEX "overline {<?>} " #define RID_OVERSTRIKEX "overstrike {<?>} " @@ -249,6 +250,7 @@ #define RID_WIDEHATX "widehat {<?>} " #define RID_WIDETILDEX "widetilde {<?>} " #define RID_WIDEVECX "widevec {<?>} " +#define RID_WIDEHARPOONX "wideharpoon {<?>} " #define RID_HBAR "hbar " #define RID_LAMBDABAR "lambdabar " #define RID_LEFTARROW "leftarrow " diff --git a/starmath/inc/token.hxx b/starmath/inc/token.hxx index c2b948bd7b70..8abe85e61858 100644 --- a/starmath/inc/token.hxx +++ b/starmath/inc/token.hxx @@ -63,6 +63,7 @@ enum SmTokenType TDOTSDIAG, TDOTSUP, TDOTSDOWN, TACUTE, TBAR, TBREVE, TCHECK, TCIRCLE, TDOT, TDDOT, TDDDOT, TGRAVE, THAT, TTILDE, TVEC, + THARPOON, TUNDERLINE, TOVERLINE, TOVERSTRIKE, TITALIC, TNITALIC, TBOLD, TNBOLD, TPHANTOM, TFONT, TSIZE, TCOLOR, TALIGNL, TALIGNC, TALIGNR, TLEFT, @@ -93,7 +94,8 @@ enum SmTokenType TUNDERBRACE, TOVERBRACE, TCIRC, THBAR, TLAMBDABAR, TLEFTARROW, TRIGHTARROW, TUPARROW, TDOWNARROW, TDIVIDES, TSETN, TSETZ, TSETQ, - TSETR, TSETC, TWIDEVEC, TWIDETILDE, TWIDEHAT, + TSETR, TSETC, TWIDEVEC, TWIDEHARPOON, TWIDETILDE, + TWIDEHAT, TWIDESLASH, TWIDEBACKSLASH, TLDBRACKET, TRDBRACKET, TNOSPACE, TUNKNOWN, TPRECEDES, TSUCCEEDS, TPRECEDESEQUAL, TSUCCEEDSEQUAL, TPRECEDESEQUIV, TSUCCEEDSEQUIV, TNOTPRECEDES, TNOTSUCCEEDS, TSILVER, diff --git a/starmath/inc/types.hxx b/starmath/inc/types.hxx index 78e33b62905a..b5cca6087346 100644 --- a/starmath/inc/types.hxx +++ b/starmath/inc/types.hxx @@ -141,6 +141,7 @@ sal_Unicode const MS_CIRCLE = 0x02DA; sal_Unicode const MS_COMBCIRCLE = 0x030A; sal_Unicode const MS_CHECK = 0x02C7; sal_Unicode const MS_COMBCHECK = 0x030C; +sal_Unicode const MS_HARPOON = 0x20D1; sal_Unicode const MS_VEC = 0x20D7; sal_Unicode const MS_DOT = 0x02D9; sal_Unicode const MS_DDOT = 0x00A8; |