[Libreoffice-commits] core.git: starmath/inc starmath/source

dante (via logerrit) logerrit at kemper.freedesktop.org
Sat Jul 18 16:27:35 UTC 2020


 starmath/inc/strings.hrc                  |    1 +
 starmath/inc/strings.hxx                  |    1 +
 starmath/inc/token.hxx                    |    2 +-
 starmath/inc/types.hxx                    |    1 +
 starmath/source/ElementsDockingWindow.cxx |    1 +
 starmath/source/parse.cxx                 |    2 ++
 6 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 7473452c22197b7a44a53b61f91c210ef573a1b4
Author:     dante <dante19031999 at gmail.com>
AuthorDate: Wed Jul 15 03:03:12 2020 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Sat Jul 18 18:26:51 2020 +0200

    Added fourier transform symbol
    
    Change-Id: I6b6f09d7e094b5dafc6aca71f273ab23fce184e0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98797
    Tested-by: Jenkins
    Reviewed-by: Dante DM <dante19031999 at gmail.com>
    Reviewed-by: Andras Timar <andras.timar at collabora.com>

diff --git a/starmath/inc/strings.hrc b/starmath/inc/strings.hrc
index a892c191220e..64144759f5cc 100644
--- a/starmath/inc/strings.hrc
+++ b/starmath/inc/strings.hrc
@@ -242,6 +242,7 @@
 #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 transform" )
+#define RID_FOURIER_HELP                    NC_("RID_FOURIER_HELP", "Fourier transform" )
 #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" )
diff --git a/starmath/inc/strings.hxx b/starmath/inc/strings.hxx
index d8fe00f803a6..fb00ac2f4782 100644
--- a/starmath/inc/strings.hxx
+++ b/starmath/inc/strings.hxx
@@ -236,6 +236,7 @@
 #define RID_NABLA           "nabla "
 #define RID_WP              "wp "
 #define RID_LAPLACE         "laplace "
+#define RID_FOURIER         "fourier "
 #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 cdc91ddf4838..1403e96987a2 100644
--- a/starmath/inc/token.hxx
+++ b/starmath/inc/token.hxx
@@ -102,7 +102,7 @@ enum SmTokenType
     TPRECEDESEQUIV, TSUCCEEDSEQUIV, TNOTPRECEDES,   TNOTSUCCEEDS,   TSILVER,
     TGRAY,          TMAROON,        TPURPLE,        TLIME,          TOLIVE,
     TNAVY,          TTEAL,          TAQUA,          TFUCHSIA,       TINTD,
-    TRGB,           TLAPLACE
+    TRGB,           TLAPLACE,       TFOURIER
 };
 
 struct SmToken
diff --git a/starmath/inc/types.hxx b/starmath/inc/types.hxx
index 044b2fab05d1..d71c87214a4f 100644
--- a/starmath/inc/types.hxx
+++ b/starmath/inc/types.hxx
@@ -79,6 +79,7 @@ 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_FOURIER = 0x2131;
 
 sal_Unicode const MS_SUBSET = 0x2282;
 sal_Unicode const MS_SUPSET = 0x2283;
diff --git a/starmath/source/ElementsDockingWindow.cxx b/starmath/source/ElementsDockingWindow.cxx
index ca62820488a1..30bd64cb99e7 100644
--- a/starmath/source/ElementsDockingWindow.cxx
+++ b/starmath/source/ElementsDockingWindow.cxx
@@ -231,6 +231,7 @@ const SmElementDescr SmElementsControl::m_aOthersList[] =
     {RID_EXISTS, RID_EXISTS_HELP}, {RID_NOTEXISTS, RID_NOTEXISTS_HELP}, {RID_FORALL, RID_FORALL_HELP},
     {RID_HBAR, RID_HBAR_HELP}, {RID_LAMBDABAR, RID_LAMBDABAR_HELP}, {RID_RE, RID_RE_HELP},
     {RID_IM, RID_IM_HELP}, {RID_WP, RID_WP_HELP}, {RID_LAPLACE, RID_LAPLACE_HELP},
+    {RID_FOURIER, RID_FOURIER_HELP},
     {nullptr, nullptr},
     {RID_LEFTARROW, RID_LEFTARROW_HELP}, {RID_RIGHTARROW, RID_RIGHTARROW_HELP}, {RID_UPARROW, RID_UPARROW_HELP},
     {RID_DOWNARROW, RID_DOWNARROW_HELP},
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index fd9bdfec262e..a51d65fbbc94 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -133,6 +133,7 @@ const SmTokenTableEntry aTokenTable[] =
     { "fixed", TFIXED, '\0', TG::Font, 0},
     { "font", TFONT, '\0', TG::FontAttr, 5},
     { "forall", TFORALL, MS_FORALL, TG::Standalone, 5},
+    { "fourier", TFOURIER, MS_FOURIER, TG::Standalone, 5},
     { "from", TFROM, '\0', TG::Limit, 0},
     { "fuchsia", TFUCHSIA, '\0', TG::Color, 0},
     { "func", TFUNC, '\0', TG::Function, 5},
@@ -1483,6 +1484,7 @@ std::unique_ptr<SmNode> SmParser::DoTerm(bool bGroupNumberIdent)
         case TPARTIAL :
         case TNABLA :
         case TLAPLACE :
+        case TFOURIER :
         case TTOWARD :
         case TDOTSAXIS :
         case TDOTSDIAG :


More information about the Libreoffice-commits mailing list