CWS changehid: resync to m89

36 files changed, 2350 insertions, 2144 deletions

diff --git a/starmath/inc/applicat.hxx b/starmath/inc/applicat.hxx
index 9c756496ae95..38fcf2b8445c 100644
--- a/starmath/inc/applicat.hxx
+++ b/starmath/inc/applicat.hxx
@@ -51,10 +51,6 @@ class SvxErrorHandler;
 **
 **/
 
-#ifdef WIN
-#define RELEASE     "WIN304"
-#endif
-
 #ifdef PM2
 #define RELEASE     "PM304"
 #endif
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index ad4e69c7308a..a421cc8a164e 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -30,9 +30,7 @@
 #include <vcl/image.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/fixed.hxx>
-#ifndef _SV_BUTTON_HXX //autogen
 #include <vcl/button.hxx>
-#endif
 #include <vcl/image.hxx>
 #include <sfx2/tabdlg.hxx>
 #include <vcl/combobox.hxx>
@@ -403,8 +401,8 @@ public:
     {
     }
 
-    void    SetChar(xub_Unicode aChar);
-    void    SetFont(const Font &rFont);
+    void    SetSymbol( const SmSym *pSym );
+    void    SetSymbol( sal_UCS4 cChar, const Font &rFont );
 };
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/starmath/inc/format.hxx b/starmath/inc/format.hxx
index f632131d834f..4d13ea48185e 100644..100755
--- a/starmath/inc/format.hxx
+++ b/starmath/inc/format.hxx
@@ -109,6 +109,7 @@ class SmFormat : public SfxBroadcaster
     USHORT      vSize[SIZ_END + 1];
     USHORT      vDist[DIS_END + 1];
     SmHorAlign  eHorAlign;
+    INT16       nGreekCharStyle;
     BOOL        bIsTextmode,
                 bScaleNormalBrackets;
 
@@ -138,6 +139,9 @@ public:
     BOOL            IsTextmode() const     { return bIsTextmode; }
     void            SetTextmode(BOOL bVal) { bIsTextmode = bVal; }
 
+    INT16           GetGreekCharStyle() const     { return nGreekCharStyle; }
+    void            SetGreekCharStyle(INT16 nVal) { nGreekCharStyle = nVal; }
+
     BOOL            IsScaleNormalBrackets() const     { return bScaleNormalBrackets; }
     void            SetScaleNormalBrackets(BOOL bVal) { bScaleNormalBrackets = bVal; }
 
diff --git a/starmath/inc/node.hxx b/starmath/inc/node.hxx
index 6ef89ea5ec1b..92c9d4621292 100644
--- a/starmath/inc/node.hxx
+++ b/starmath/inc/node.hxx
@@ -311,19 +311,10 @@ class SmTextNode : public SmVisibleNode
     USHORT      nFontDesc;
 
 protected:
-    SmTextNode(SmNodeType eNodeType, const SmToken &rNodeToken, USHORT nFontDescP)
-    :   SmVisibleNode(eNodeType, rNodeToken)
-    {
-        nFontDesc = nFontDescP;
-    }
+    SmTextNode(SmNodeType eNodeType, const SmToken &rNodeToken, USHORT nFontDescP );
 
 public:
-    SmTextNode(const SmToken &rNodeToken, USHORT nFontDescP)
-    :   SmVisibleNode(NTEXT, rNodeToken)
-    {
-        nFontDesc = nFontDescP;
-    }
-
+    SmTextNode(const SmToken &rNodeToken, USHORT nFontDescP );
 
     USHORT              GetFontDesc() const { return nFontDesc; }
     void                SetText(const XubString &rText) { aText = rText; }
@@ -347,15 +338,13 @@ public:
 
 class SmSpecialNode : public SmTextNode
 {
+    bool    bIsFromGreekSymbolSet;
+
 protected:
-    SmSpecialNode(SmNodeType eNodeType, const SmToken &rNodeToken, USHORT _nFontDesc)
-    :   SmTextNode(eNodeType, rNodeToken, _nFontDesc)
-    {}
+    SmSpecialNode(SmNodeType eNodeType, const SmToken &rNodeToken, USHORT _nFontDesc);
 
 public:
-    SmSpecialNode(const SmToken &rNodeToken)
-    :   SmTextNode(NSPECIAL, rNodeToken, FNT_MATH)  //! default Font nicht immer richtig
-    {}
+    SmSpecialNode(const SmToken &rNodeToken);
 
     virtual void Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell);
     virtual void Arrange(const OutputDevice &rDev, const SmFormat &rFormat);
diff --git a/starmath/inc/starmath.hrc b/starmath/inc/starmath.hrc
index f83ae0fc8c23..1b919471115c 100644..100755
--- a/starmath/inc/starmath.hrc
+++ b/starmath/inc/starmath.hrc
@@ -36,28 +36,28 @@
 #define SID_PREVERR                 (SID_SMA_START + 2)
 #define SID_NEXTMARK                (SID_SMA_START + 3)
 #define SID_PREVMARK                (SID_SMA_START + 4)
-#define SID_SYMBOLS_CATALOGUE                   (SID_SMA_START + 5)
+#define SID_SYMBOLS_CATALOGUE       (SID_SMA_START + 5)
 #define SID_PREFERENCES             (SID_SMA_START + 6)
 #define SID_VIEW050                 (SID_SMA_START + 7)
 #define SID_VIEW100                 (SID_SMA_START + 8)
 #define SID_VIEW200                 (SID_SMA_START + 9)
-#define SID_ZOOMIN                              (SID_SMA_START + 10)
+#define SID_ZOOMIN                  (SID_SMA_START + 10)
 #define SID_ZOOMOUT                 (SID_SMA_START + 11)
-#define SID_DRAW                                (SID_SMA_START + 12)
-#define SID_ADJUST                              (SID_SMA_START + 13)
+#define SID_DRAW                    (SID_SMA_START + 12)
+#define SID_ADJUST                  (SID_SMA_START + 13)
 #define SID_TOOLBOX                 (SID_SMA_START + 14)
 #define SID_FORMULACURSOR           (SID_SMA_START + 15)
-#define SID_FONT                                (SID_SMA_START + 50)
+#define SID_FONT                    (SID_SMA_START + 50)
 #define SID_FONTSIZE                (SID_SMA_START + 51)
 #define SID_DISTANCE                (SID_SMA_START + 52)
-#define SID_ALIGN                               (SID_SMA_START + 53)
+#define SID_ALIGN                   (SID_SMA_START + 53)
 
 #define SID_AUTO_REDRAW             (SID_SMA_START + 55)
 #define SID_SYMBOLS                 (SID_SMA_START + 56) // Muss erstmal wieder aufgenommen werden !
 #define SID_TEXTMODE                (SID_SMA_START + 57)
-#define SID_INSERT_FORMULA          (SID_SMA_START + 58)
-#define SID_TEXT                                (SID_SMA_START + 100)
-#define SID_GAPHIC_SM                           (SID_SMA_START + 101)
+#define SID_IMPORT_FORMULA          (SID_SMA_START + 58)
+#define SID_TEXT                    (SID_SMA_START + 100)
+#define SID_GAPHIC_SM               (SID_SMA_START + 101)
 #define SID_FITINWINDOW             (SID_SMA_START + 103)
 #define SID_INSERTTEXT              (SID_SMA_START + 104)
 #define SID_INSERTCOMMAND           (SID_SMA_START + 105)
@@ -82,7 +82,7 @@
 #define SID_CMDBOXWINDOW            (SID_SMA_START + 122)
 #define SID_TOOLBOXWINDOW           (SID_SMA_START + 123)
 #define SID_NO_RIGHT_SPACES         (SID_SMA_START + 124)
-#define SID_DUMMY                               (SID_SMA_START + 254)
+#define SID_DUMMY                   (SID_SMA_START + 254)
 
 //#define GID_FORMEL                            (RID_GROUPS_OFFSET + 1)
 //#define GID_ERROR                             (RID_GROUPS_OFFSET + 2)
@@ -108,7 +108,7 @@
 #define RID_READSYMBOLERROR         (RID_APP_START + 203)
 #define RID_NOMATHTYPEFACEWARNING   (RID_APP_START + 204)
 #define RID_OBJECTNAME              (RID_APP_START + 501)
-#define RID_VIEWNAME                (RID_APP_START + 502)
+    // free
 #define RID_UNDOEDITNAME            (RID_APP_START + 503)
 #define RID_UNDOFORMATNAME          (RID_APP_START + 504)
 #define RID_APPICO                  (RID_APP_START + 601)
diff --git a/starmath/inc/symbol.hxx b/starmath/inc/symbol.hxx
index 503859485095..621538790300 100644
--- a/starmath/inc/symbol.hxx
+++ b/starmath/inc/symbol.hxx
@@ -38,7 +38,10 @@
 #include <map>
 #include <vector>
 #include <set>
+#include <functional>
+#include <algorithm>
 
+#include "unomodel.hxx"
 #include "utility.hxx"
 #include "smmod.hxx"
 
@@ -79,24 +82,24 @@ class SmSym
     String              m_aName;
     String              m_aExportName;
     String              m_aSetName;
-    sal_Unicode         m_cChar;
+    sal_UCS4            m_cChar;
     BOOL                m_bPredefined;
     BOOL                m_bDocSymbol;
 
 public:
     SmSym();
-    SmSym(const String& rName, const Font& rFont, sal_Unicode cChar,
+    SmSym(const String& rName, const Font& rFont, sal_UCS4 cChar,
           const String& rSet, BOOL bIsPredefined = FALSE);
     SmSym(const SmSym& rSymbol);
 
     SmSym&      operator = (const SmSym& rSymbol);
 
     const Font&     GetFace() const { return m_aFace; }
-    sal_Unicode     GetCharacter() const { return m_cChar; }
+    sal_UCS4        GetCharacter() const { return m_cChar; }
     const String&   GetName() const { return m_aName; }
 
     void            SetFace( const Font& rFont )        { m_aFace = rFont; }
-    void            SetCharacter( sal_Unicode cChar )   { m_cChar = cChar; }
+    void            SetCharacter( sal_UCS4 cChar )   { m_cChar = cChar; }
 
 //! since the symbol name is also used as key in the map it should not be possible to change the name
 //! because ten the key would not be the same as its supposed copy here
@@ -133,6 +136,15 @@ typedef std::map< String, SmSym, lt_String >    SymbolMap_t;
 // vector of pointers to the actual symbols in the above container
 typedef std::vector< const SmSym * >            SymbolPtrVec_t;
 
+struct lt_SmSymPtr : public std::binary_function< const SmSym *, const SmSym *, bool >
+{
+    bool operator() ( const SmSym *pSym1, const SmSym *pSym2 )
+    {
+        return pSym1->GetCharacter() < pSym2->GetCharacter();
+    }
+};
+
+
 class SmSymbolManager : public SfxListener
 {
     SymbolMap_t         m_aSymbols;
diff --git a/starmath/inc/toolbox.hxx b/starmath/inc/toolbox.hxx
index 1881adc0f845..fcc1b046f2dd 100644..100755
--- a/starmath/inc/toolbox.hxx
+++ b/starmath/inc/toolbox.hxx
@@ -30,12 +30,10 @@
 #include <sfx2/basedlgs.hxx>
 #include <sfx2/childwin.hxx>
 #include <vcl/toolbox.hxx>
+
 #include "smmod.hxx"
 #include "config.hxx"
-
-#include "dialog.hrc"
-
-#define NUM_TBX_CATEGORIES  9
+#include "toolbox.hrc"
 
 class SmToolBoxWindow : public SfxFloatingWindow
 {
diff --git a/starmath/inc/utility.hxx b/starmath/inc/utility.hxx
index e7db51152e25..d01c894af592 100644
--- a/starmath/inc/utility.hxx
+++ b/starmath/inc/utility.hxx
@@ -42,10 +42,6 @@ class String;
 
 #define C2S(cChar) String::CreateFromAscii(RTL_CONSTASCII_STRINGPARAM(cChar))
 
-/////////////////////////////////////////////////////////////////
-
-const ByteString    ExportString( const String& rString );
-const String        ImportString( const ByteString& rByteString );
 
 /////////////////////////////////////////////////////////////////
 
diff --git a/starmath/prj/d.lst b/starmath/prj/d.lst
index bc48875e81e6..78bae57498ea 100644
--- a/starmath/prj/d.lst
+++ b/starmath/prj/d.lst
@@ -19,3 +19,5 @@ mkdir: %_DEST%\inc%_EXT%\starmath
 ..\uiconfig\smath\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\smath\menubar\*.xml
 ..\uiconfig\smath\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\smath\toolbar\*.xml
 ..\uiconfig\smath\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\smath\statusbar\*.xml
+..\%__SRC%\misc\sm.component %_DEST%\xml%_EXT%\sm.component
+..\%__SRC%\misc\smd.component %_DEST%\xml%_EXT%\smd.component
diff --git a/starmath/sdi/smath.sdi b/starmath/sdi/smath.sdi
index f1f812e6c40b..4b9eaedac599 100644..100755
--- a/starmath/sdi/smath.sdi
+++ b/starmath/sdi/smath.sdi
@@ -403,8 +403,8 @@ SfxVoidItem InsertConfigName SID_INSERTTEXT
 ]
 
 //--------------------------------------------------------------------------
-SfxBoolItem InsertFormula SID_INSERT_FORMULA
-(SfxStringItem Name SID_INSERT_FORMULA,SfxStringItem Filter FN_PARAM_1)
+SfxBoolItem ImportFormula SID_IMPORT_FORMULA
+(SfxStringItem Name SID_IMPORT_FORMULA,SfxStringItem Filter FN_PARAM_1)
 [
     /* flags: */
     AutoUpdate = FALSE,
diff --git a/starmath/sdi/smslots.sdi b/starmath/sdi/smslots.sdi
index 9e27c7149502..69cecf25f308 100644..100755
--- a/starmath/sdi/smslots.sdi
+++ b/starmath/sdi/smslots.sdi
@@ -275,12 +275,12 @@ interface FormulaView
         ExecMethod = Execute ;
         StateMethod = GetState ;
     ]
-        SID_INSERT_FORMULA //idlpp ole : no , status : no
-        [
-                ExecMethod = Execute ;
-                StateMethod = GetState ;
-                Export = FALSE ;
-        ]
+    SID_IMPORT_FORMULA //idlpp ole : no , status : no
+    [
+        ExecMethod = Execute ;
+        StateMethod = GetState ;
+        Export = FALSE ;
+    ]
     //idlpp kein Menueeintrag , also keine Texte
     SID_ATTR_ZOOM //idlpp ole : no , status : no
     [
diff --git a/starmath/source/cfgitem.cxx b/starmath/source/cfgitem.cxx
index bf62157a30d3..21ae6c0e63df 100644
--- a/starmath/source/cfgitem.cxx
+++ b/starmath/source/cfgitem.cxx
@@ -42,7 +42,6 @@ using namespace com::sun::star;
 using namespace com::sun::star::uno;
 using namespace com::sun::star::beans;
 
-#define A2OU(x)        rtl::OUString::createFromAscii( x )
 
 static const char* aRootName = "Office.Math";
 
@@ -127,6 +126,7 @@ static const char * aMathPropNames[] =
 static const char * aFormatPropNames[] =
 {
     "StandardFormat/Textmode",
+    "StandardFormat/GreekCharStyle",
     "StandardFormat/ScaleNormalBracket",
     "StandardFormat/HorizontalAlignment",
     "StandardFormat/BaseSize",
@@ -490,7 +490,7 @@ void SmMathConfig::ReadSymbol( SmSym &rSymbol,
     {
         const Any * pValue = aValues.getConstArray();
         Font        aFont;
-        sal_Unicode cChar = '\0';
+        sal_UCS4    cChar = '\0';
         String      aSet;
         BOOL        bPredefined = FALSE;
 
@@ -500,7 +500,7 @@ void SmMathConfig::ReadSymbol( SmSym &rSymbol,
 
         BOOL bOK = TRUE;
         if (pValue->hasValue()  &&  (*pValue >>= nTmp32))
-            cChar = (sal_Unicode) nTmp32;
+            cChar = static_cast< sal_UCS4 >( nTmp32 );
         else
             bOK = FALSE;
         ++pValue;
@@ -624,7 +624,7 @@ void SmMathConfig::SetSymbols( const std::vector< SmSym > &rNewSymbols )
         // Char
         pVal->Name  = aNodeNameDelim;
         pVal->Name += *pName++;
-        pVal->Value <<= (INT32) rSymbol.GetCharacter();
+        pVal->Value <<= static_cast< sal_UCS4 >( rSymbol.GetCharacter() );
         pVal++;
         // Set
         pVal->Name  = aNodeNameDelim;
@@ -994,6 +994,10 @@ void SmMathConfig::LoadFormat()
         if (pVal->hasValue()  &&  (*pVal >>= bTmp))
             pFormat->SetTextmode( bTmp );
         ++pVal;
+        // StandardFormat/GreekCharStyle
+        if (pVal->hasValue()  &&  (*pVal >>= nTmp16))
+            pFormat->SetGreekCharStyle( nTmp16 );
+        ++pVal;
         // StandardFormat/ScaleNormalBracket
         if (pVal->hasValue()  &&  (*pVal >>= bTmp))
             pFormat->SetScaleNormalBrackets( bTmp );
@@ -1069,6 +1073,8 @@ void SmMathConfig::SaveFormat()
 
     // StandardFormat/Textmode
     *pValue++ <<= (BOOL) pFormat->IsTextmode();
+    // StandardFormat/GreekCharStyle
+    *pValue++ <<= (INT16) pFormat->GetGreekCharStyle();
     // StandardFormat/ScaleNormalBracket
     *pValue++ <<= (BOOL) pFormat->IsScaleNormalBrackets();
     // StandardFormat/HorizontalAlignment
diff --git a/starmath/source/detreg.cxx b/starmath/source/detreg.cxx
index c79813f994a7..ef4b261ce0b3 100644
--- a/starmath/source/detreg.cxx
+++ b/starmath/source/detreg.cxx
@@ -48,29 +48,6 @@ void SAL_CALL component_getImplementationEnvironment(
     *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
 }
 
-sal_Bool SAL_CALL component_writeInfo(  void*   /*pServiceManager*/,
-                                        void*   pRegistryKey    )
-{
-    Reference< ::registry::XRegistryKey >
-            xKey( reinterpret_cast< ::registry::XRegistryKey* >( pRegistryKey ) ) ;
-
-    OUString aDelimiter( RTL_CONSTASCII_USTRINGPARAM("/") );
-    OUString aUnoServices( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") );
-
-    // Eigentliche Implementierung und ihre Services registrieren
-    sal_Int32 i;
-    Reference< ::registry::XRegistryKey >  xNewKey;
-
-    xNewKey = xKey->createKey( aDelimiter + SmFilterDetect::impl_getStaticImplementationName() +
-                               aUnoServices );
-
-    Sequence< OUString > aServices = SmFilterDetect::impl_getStaticSupportedServiceNames();
-    for(i = 0; i < aServices.getLength(); i++ )
-        xNewKey->createKey( aServices.getConstArray()[i] );
-
-    return sal_True;
-}
-
 void* SAL_CALL component_getFactory( const sal_Char* pImplementationName,
                                      void* pServiceManager,
                                      void* /*pRegistryKey*/ )
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index d61686b747dd..a33ab14a98bf 100644..100755
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -50,17 +50,18 @@
 #include <svx/ucsubset.hxx>
 
 
-#include "config.hxx"
 #include "dialog.hxx"
-#ifndef _STARMATH_HRC
 #include "starmath.hrc"
-#endif
-
+#include "config.hxx"
 #include "dialog.hrc"
 #include "smmod.hxx"
 #include "symbol.hxx"
 #include "view.hxx"
 #include "document.hxx"
+#include "unomodel.hxx"
+
+
+using ::rtl::OUString;
 
 ////////////////////////////////////////
 //
@@ -1158,11 +1159,13 @@ void SmShowSymbolSet::Paint(const Rectangle&)
         SetTextColor( aTxtColor );
 
         int   nIV   = i - v;
-        Size  aSize(GetTextWidth(aSymbol.GetCharacter()), GetTextHeight());
+        sal_UCS4 cChar = aSymbol.GetCharacter();
+        String aText( OUString( &cChar, 1 ) );
+        Size  aSize( GetTextWidth( aText ), GetTextHeight());
 
         DrawText(Point((nIV % nColumns) * nLen + (nLen - aSize.Width()) / 2,
                        (nIV / nColumns) * nLen + (nLen - aSize.Height()) / 2),
-                 aSymbol.GetCharacter());
+                 aText);
     }
 
     if (nSelectSymbol != SYMBOL_NONE)
@@ -1334,7 +1337,7 @@ void SmShowSymbol::Paint(const Rectangle &rRect)
     Size            aTextSize(GetTextWidth(rText), GetTextHeight());
 
     DrawText(Point((GetOutputSize().Width()  - aTextSize.Width())  / 2,
-                   (GetOutputSize().Height() - aTextSize.Height()) / 2), rText);
+                   (GetOutputSize().Height() * 7/10)), rText);
 }
 
 
@@ -1351,17 +1354,14 @@ void SmShowSymbol::SetSymbol(const SmSym *pSymbol)
 {
     if (pSymbol)
     {
-        Color aTxtColor( GetTextColor() );
-
         Font aFont (pSymbol->GetFace());
         aFont.SetSize(Size(0, GetOutputSize().Height() - GetOutputSize().Height() / 3));
-        aFont.SetAlign(ALIGN_TOP);
+        aFont.SetAlign(ALIGN_BASELINE);
         SetFont(aFont);
 
-        // keep old text color (font may have different color set)
-        SetTextColor(aTxtColor);
-
-        SetText(XubString(pSymbol->GetCharacter()));
+        sal_UCS4 cChar = pSymbol->GetCharacter();
+        String aText( OUString( &cChar, 1 ) );
+        SetText( aText );
     }
 
     // 'Invalidate' fuellt den background mit der background-Farbe.
@@ -1484,8 +1484,9 @@ IMPL_LINK( SmSymbolDialog, GetClickHdl, Button *, EMPTYARG pButton )
     const SmSym *pSym = GetSymbol();
     if (pSym)
     {
-        XubString   aText ('%');
+        String  aText ('%');
         aText += pSym->GetName();
+        aText += (sal_Unicode)' ';
 
         rViewSh.GetViewFrame()->GetDispatcher()->Execute(
                 SID_INSERTTEXT, SFX_CALLMODE_STANDARD,
@@ -1601,6 +1602,9 @@ BOOL SmSymbolDialog::SelectSymbolSet(const XubString &rSymbolSetName)
         aSymbolSetName  = rSymbolSetName;
         aSymbolSet      = rSymbolMgr.GetSymbolSet( aSymbolSetName );
 
+        // sort symbols by Unicode position (useful for displaying Greek characters alphabetically)
+        std::sort( aSymbolSet.begin(), aSymbolSet.end(), lt_SmSymPtr() );
+
         aSymbolSetDisplay.SetSymbolSet( aSymbolSet );
         if (aSymbolSet.size() > 0)
             SelectSymbol(0);
@@ -1641,42 +1645,43 @@ void SmShowChar::Paint(const Rectangle &rRect)
 {
     Control::Paint( rRect );
 
-    XubString Text (GetText ());
-    if (Text.Len() > 0)
+    OUString aText( GetText() );
+    if (aText.getLength() > 0)
     {
-        Size aTextSize(GetTextWidth(Text), GetTextHeight());
+#if OSL_DEBUG_LEVEL > 1
+        sal_Int32 nPos = 0;
+        sal_UCS4 cChar = aText.iterateCodePoints( &nPos );
+        (void) cChar;
+#endif
+        Size aTextSize(GetTextWidth(aText), GetTextHeight());
 
         DrawText(Point((GetOutputSize().Width()  - aTextSize.Width())  / 2,
-                       (GetOutputSize().Height() - aTextSize.Height()) / 2), Text);
+                       (GetOutputSize().Height() * 7/10)), aText);
     }
 }
 
 
-void SmShowChar::SetChar(xub_Unicode aChar)
+void SmShowChar::SetSymbol( const SmSym *pSym )
 {
-    SetText(XubString(aChar));
-    Invalidate();
+    if (pSym)
+        SetSymbol( pSym->GetCharacter(), pSym->GetFace() );
 }
 
 
-void SmShowChar::SetFont(const Font &rFont)
+void SmShowChar::SetSymbol( sal_UCS4 cChar, const Font &rFont )
 {
-    Color aTxtColor( GetTextColor() );
+    Font aFont( rFont );
+    aFont.SetSize( Size(0, GetOutputSize().Height() - GetOutputSize().Height() / 3) );
+    aFont.SetAlign(ALIGN_BASELINE);
+    SetFont(aFont);
 
-    Font  aFont (rFont);
-    Size  aSize (Size(0, GetOutputSize().Height() - GetOutputSize().Height() / 3));
-
-    aFont.SetSize(aSize);
-    aFont.SetAlign(ALIGN_TOP);
-    aFont.SetTransparent(TRUE);
-    Control::SetFont(aFont);
-
-    // keep text color (new font may have different one)
-    SetTextColor( aTxtColor );
+    String aText( OUString( &cChar, 1) );
+    SetText( aText );
 
     Invalidate();
 }
 
+
 ////////////////////////////////////////////////////////////////////////////////
 
 void SmSymDefineDialog::FillSymbols(ComboBox &rComboBox, BOOL bDeleteText)
@@ -1863,7 +1868,7 @@ IMPL_LINK( SmSymDefineDialog, StyleChangeHdl, ComboBox *, EMPTYARG pComboBox )
 
 IMPL_LINK( SmSymDefineDialog, CharHighlightHdl, Control *, EMPTYARG )
 {
-    sal_UCS4 cChar = aCharsetDisplay.GetSelectCharacter();
+   sal_UCS4 cChar = aCharsetDisplay.GetSelectCharacter();
 
 #if OSL_DEBUG_LEVEL > 1
     DBG_ASSERT( pSubsetMap, "SubsetMap missing" );
@@ -1877,9 +1882,18 @@ IMPL_LINK( SmSymDefineDialog, CharHighlightHdl, Control *, EMPTYARG )
             aFontsSubsetLB.SetNoSelection();
     }
 
-    // TO_DO_UCS4 (#i74049): get rid of cast without loosing UCS4 functionality
-    aSymbolDisplay.SetChar( sal::static_int_cast< sal_Unicode >(cChar) );
+    aSymbolDisplay.SetSymbol( cChar, aCharsetDisplay.GetFont() );
+
     UpdateButtons();
+
+    // display Unicode position as symbol name while iterating over characters
+    const String aHex( String::CreateFromInt64( cChar, 16 ).ToUpperAscii() );
+    const String aPattern( A2OU( aHex.Len() > 4 ? "Ux000000" : "Ux0000" ) );
+    String aUnicodePos( aPattern.Copy( 0, aPattern.Len() - aHex.Len() ) );
+    aUnicodePos += aHex;
+    aSymbols.SetText( aUnicodePos );
+    aSymbolName.SetText( aUnicodePos );
+
     return 0;
 }
 
@@ -1893,16 +1907,13 @@ IMPL_LINK( SmSymDefineDialog, AddClickHdl, Button *, EMPTYARG pButton )
 #endif
 
     // add symbol
-    // TO_DO_UCS4 (#i74049): get rid of cast without loosing UCS4 functionality
     const SmSym aNewSymbol( aSymbols.GetText(), aCharsetDisplay.GetFont(),
-            sal::static_int_cast< sal_Unicode >( aCharsetDisplay.GetSelectCharacter() ),
-            aSymbolSets.GetText() );
+            aCharsetDisplay.GetSelectCharacter(), aSymbolSets.GetText() );
     //DBG_ASSERT( aSymbolMgrCopy.GetSymbolByName(aTmpSymbolName) == NULL, "symbol already exists" );
     aSymbolMgrCopy.AddOrReplaceSymbol( aNewSymbol );
 
     // update display of new symbol
-    aSymbolDisplay.SetChar( aNewSymbol.GetCharacter() );
-    aSymbolDisplay.SetFont( aNewSymbol.GetFace() );
+    aSymbolDisplay.SetSymbol( &aNewSymbol );
     aSymbolName.SetText( aNewSymbol.GetName() );
     aSymbolSetName.SetText( aNewSymbol.GetSymbolSetName() );
 
@@ -1929,10 +1940,8 @@ IMPL_LINK( SmSymDefineDialog, ChangeClickHdl, Button *, EMPTYARG pButton )
     // get new Sybol to use
     //! get font from symbol-disp lay since charset-display does not keep
     //! the bold attribut.
-    // TO_DO_UCS4 (#i74049): get rid of cast without loosing UCS4 functionality
     const SmSym aNewSymbol( aSymbols.GetText(), aCharsetDisplay.GetFont(),
-            sal::static_int_cast< sal_Unicode >( aCharsetDisplay.GetSelectCharacter() ),
-            aSymbolSets.GetText() );
+            aCharsetDisplay.GetSelectCharacter(), aSymbolSets.GetText() );
 
     // remove old symbol if the name was changed then add new one
 //    const bool bSetNameChanged    = aOldSymbolSets.GetText() != aSymbolSets.GetText();
@@ -1946,8 +1955,7 @@ IMPL_LINK( SmSymDefineDialog, ChangeClickHdl, Button *, EMPTYARG pButton )
         SetOrigSymbol(NULL, XubString());
 
     // update display of new symbol
-    aSymbolDisplay.SetChar( aNewSymbol.GetCharacter() );
-    aSymbolDisplay.SetFont( aNewSymbol.GetFace() );
+    aSymbolDisplay.SetSymbol( &aNewSymbol );
     aSymbolName.SetText( aNewSymbol.GetName() );
     aSymbolSetName.SetText( aNewSymbol.GetSymbolSetName() );
 
@@ -2080,8 +2088,8 @@ SmSymDefineDialog::SmSymDefineDialog(Window * pParent,
 
     // auto completion is troublesome since that symbols character also gets automatically selected in the
     // display and if the user previously selected a character to define/redefine that one this is bad
-   aOldSymbols.EnableAutocomplete( FALSE, TRUE );
-   aSymbols   .EnableAutocomplete( FALSE, TRUE );
+    aOldSymbols.EnableAutocomplete( FALSE, TRUE );
+    aSymbols   .EnableAutocomplete( FALSE, TRUE );
 
     FillFonts();
     if (aFonts.GetEntryCount() > 0)
@@ -2267,8 +2275,7 @@ void SmSymDefineDialog::SetOrigSymbol(const SmSym *pSymbol,
 
         aSymName    = pSymbol->GetName();
         aSymSetName = rSymbolSetName;
-        aOldSymbolDisplay.SetFont(pSymbol->GetFace());
-        aOldSymbolDisplay.SetChar(pSymbol->GetCharacter());
+        aOldSymbolDisplay.SetSymbol( pSymbol );
     }
     else
     {   // loeschen des angezeigten Symbols
@@ -2322,6 +2329,10 @@ BOOL SmSymDefineDialog::SelectSymbol(ComboBox &rComboBox,
 
                 // das zugehoerige Zeichen auswaehlen
                 SelectChar(pSymbol->GetCharacter());
+
+                // since SelectChar will also set the unicode point as text in the
+                // symbols box, we have to set the symbol name again to get that one displayed
+                aSymbols.SetText( pSymbol->GetName() );
             }
         }
 
@@ -2378,7 +2389,7 @@ void SmSymDefineDialog::SetFont(const XubString &rFontName, const XubString &rSt
         aFontsSubsetLB.SetEntryData( nPos, (void *) pSubset );
         // subset must live at least as long as the selected font !!!
         if( bFirst )
-        aFontsSubsetLB.SelectEntryPos( nPos );
+            aFontsSubsetLB.SelectEntryPos( nPos );
         bFirst = false;
     }
     if( bFirst )
@@ -2398,7 +2409,11 @@ BOOL SmSymDefineDialog::SelectFont(const XubString &rFontName, BOOL bApplyFont)
         if (aStyles.GetEntryCount() > 0)
             SelectStyle(aStyles.GetEntry(0));
         if (bApplyFont)
+        {
             SetFont(aFonts.GetSelectEntry(), aStyles.GetText());
+            // update preview to use new font
+            aSymbolDisplay.SetSymbol( aCharsetDisplay.GetSelectCharacter(), aCharsetDisplay.GetFont() );
+        }
         bRet = TRUE;
     }
     else
@@ -2425,7 +2440,11 @@ BOOL SmSymDefineDialog::SelectStyle(const XubString &rStyleName, BOOL bApplyFont
     {
         aStyles.SetText(aStyles.GetEntry(nPos));
         if (bApplyFont)
+        {
             SetFont(aFonts.GetSelectEntry(), aStyles.GetText());
+            // update preview to use new font
+            aSymbolDisplay.SetSymbol( aCharsetDisplay.GetSelectCharacter(), aCharsetDisplay.GetFont() );
+        }
         bRet = TRUE;
     }
     else
@@ -2440,7 +2459,7 @@ BOOL SmSymDefineDialog::SelectStyle(const XubString &rStyleName, BOOL bApplyFont
 void SmSymDefineDialog::SelectChar(xub_Unicode cChar)
 {
     aCharsetDisplay.SelectCharacter( cChar );
-    aSymbolDisplay.SetChar( cChar );
+    aSymbolDisplay.SetSymbol( cChar, aCharsetDisplay.GetFont() );
 
     UpdateButtons();
 }
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index 49739af72972..ab1382b97879 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -131,9 +131,9 @@ void SmDocShell::SFX_NOTIFY(SfxBroadcaster&, const TypeId&,
     {
         case HINT_FORMATCHANGED:
             SetFormulaArranged(FALSE);
-            nModifyCount++;     //! merkwuerdig...
-                                // ohne dies wird die Grafik letztlich
-                                // nicht geupdatet
+
+            nModifyCount++;     //! see comment for SID_GAPHIC_SM in SmDocShell::GetState
+
             Repaint();
             break;
     }
@@ -211,11 +211,19 @@ void SmDocShell::SetFormat(SmFormat& rFormat)
     RTL_LOGFILE_CONTEXT( aLog, "starmath: SmDocShell::SetFormat" );
 
     aFormat = rFormat;
-    SetFormulaArranged(FALSE);
-    SmViewShell *pViewSh = SmGetActiveView();
-    if (pViewSh)
-        pViewSh->GetViewFrame()->GetBindings().Invalidate(SID_GAPHIC_SM);
-    SetModified(TRUE);
+    SetFormulaArranged( FALSE );
+    SetModified( TRUE );
+
+    nModifyCount++;     //! see comment for SID_GAPHIC_SM in SmDocShell::GetState
+
+    // don't use SmGetActiveView since the view shell might not be active (0 pointer)
+    // if for example the Basic Macro dialog currently has the focus. Thus:
+    SfxViewFrame* pFrm = SfxViewFrame::GetFirst( this );
+    while (pFrm)
+    {
+        pFrm->GetBindings().Invalidate(SID_GAPHIC_SM);
+        pFrm = SfxViewFrame::GetNext( *pFrm, this );
+    }
 }
 
 String SmDocShell::GetAccessibleText()
@@ -241,7 +249,7 @@ void SmDocShell::Parse()
         delete pTree;
     ReplaceBadChars();
     pTree = aInterpreter.Parse(aText);
-    nModifyCount++;
+    nModifyCount++;     //! see comment for SID_GAPHIC_SM in SmDocShell::GetState
     SetFormulaArranged( FALSE );
 }
 
@@ -1123,13 +1131,9 @@ void SmDocShell::Execute(SfxRequest& rReq)
 
         case SID_TEXT:
         {
-            const SfxStringItem& rItem =
-                (const SfxStringItem&)rReq.GetArgs()->Get(SID_TEXT);
-
+            const SfxStringItem& rItem = (const SfxStringItem&)rReq.GetArgs()->Get(SID_TEXT);
             if (GetText() != rItem.GetValue())
-            {
                 SetText(rItem.GetValue());
-            }
         }
         break;
 
@@ -1222,6 +1226,10 @@ void SmDocShell::GetState(SfxItemSet &rSet)
             break;
 
         case SID_GAPHIC_SM:
+            //! very old (pre UNO) and ugly hack to invalidate the SmGraphicWindow.
+            //! If nModifyCount gets changed then the call below will implicitly notify
+            //! SmGraphicController::StateChanged and there the window gets invalidated.
+            //! Thus all the 'nModifyCount++' before invalidating this slot.
             rSet.Put(SfxInt16Item(SID_GAPHIC_SM, nModifyCount));
             break;
 
diff --git a/starmath/source/edit.cxx b/starmath/source/edit.cxx
index f7093f9c3815..020376c05dfb 100644
--- a/starmath/source/edit.cxx
+++ b/starmath/source/edit.cxx
@@ -252,6 +252,7 @@ IMPL_LINK( SmEditWindow, ModifyTimerHdl, Timer *, EMPTYARG /*pTimer*/ )
     SmModule *pp = SM_MOD();
     if (pp->GetConfig()->IsAutoRedraw())
         Flush();
+    aModifyTimer.Stop();
     return 0;
 }
 
@@ -279,6 +280,7 @@ IMPL_LINK(SmEditWindow, CursorMoveTimerHdl, Timer *, EMPTYARG /*pTimer*/)
             aOldSelection = aNewSelection;
         }
     }
+    aCursorMoveTimer.Stop();
 
     return 0;
 }
@@ -435,7 +437,7 @@ void SmEditWindow::KeyInput(const KeyEvent& rKEvt)
             SmViewShell *pView = GetView();
             if ( pView && !pView->KeyInput(rKEvt) )
             {
-                    /* fuert bei F1 (Hilfe) zum Zerstoeren von this! */
+                /* fuert bei F1 (Hilfe) zum Zerstoeren von this! */
                 Flush();
                 if ( aModifyTimer.IsActive() )
                     aModifyTimer.Stop();
@@ -734,6 +736,9 @@ void SmEditWindow::InsertCommand(USHORT nCommand)
             pEditView->SetSelection(aSelection);
         }
 
+        aModifyTimer.Start();
+        aCursorMoveTimer.Start();
+
         GrabFocus();
     }
 }
@@ -917,7 +922,11 @@ void SmEditWindow::InsertText(const String& Text)
 {
     DBG_ASSERT( pEditView, "EditView missing" );
     if (pEditView)
+    {
         pEditView->InsertText(Text);
+        aModifyTimer.Start();
+        aCursorMoveTimer.Start();
+    }
 }
 
 void SmEditWindow::Flush()
@@ -928,9 +937,11 @@ void SmEditWindow::Flush()
         pEditEngine->ClearModifyFlag();
         SmViewShell *pViewSh = rCmdBox.GetView();
         if (pViewSh)
+        {
             pViewSh->GetViewFrame()->GetDispatcher()->Execute(
                     SID_TEXT, SFX_CALLMODE_STANDARD,
                     new SfxStringItem(SID_TEXT, GetText()), 0L);
+        }
     }
 
     if (aCursorMoveTimer.IsActive())
diff --git a/starmath/source/format.cxx b/starmath/source/format.cxx
index 18aaed4c841c..e92d1a5e97aa 100644
--- a/starmath/source/format.cxx
+++ b/starmath/source/format.cxx
@@ -112,8 +112,9 @@ SmFormat::SmFormat()
 {
     nVersion    = SM_FMT_VERSION_NOW;
 
-    eHorAlign   = AlignCenter;
-    bIsTextmode = bScaleNormalBrackets = FALSE;
+    eHorAlign       = AlignCenter;
+    nGreekCharStyle = 0;
+    bIsTextmode     = bScaleNormalBrackets = FALSE;
 
     vSize[SIZ_TEXT]     = 100;
     vSize[SIZ_INDEX]    = 60;
@@ -191,6 +192,7 @@ SmFormat & SmFormat::operator = (const SmFormat &rFormat)
     SetVersion (rFormat.GetVersion());
     SetHorAlign(rFormat.GetHorAlign());
     SetTextmode(rFormat.IsTextmode());
+    SetGreekCharStyle(rFormat.GetGreekCharStyle());
     SetScaleNormalBrackets(rFormat.IsScaleNormalBrackets());
 
     USHORT  i;
@@ -212,6 +214,7 @@ BOOL SmFormat::operator == (const SmFormat &rFormat) const
 {
     BOOL bRes = aBaseSize == rFormat.aBaseSize  &&
                 eHorAlign == rFormat.eHorAlign  &&
+                nGreekCharStyle == rFormat.nGreekCharStyle &&
                 bIsTextmode == rFormat.bIsTextmode  &&
                 bScaleNormalBrackets  == rFormat.bScaleNormalBrackets;
 
diff --git a/starmath/source/makefile.mk b/starmath/source/makefile.mk
index 596060397e18..0e038bb9c78d 100644..100755
--- a/starmath/source/makefile.mk
+++ b/starmath/source/makefile.mk
@@ -36,6 +36,8 @@ LIBTARGET=NO
 
 # --- Settings -----------------------------------------------------
 
+ENABLE_EXCEPTIONS=TRUE
+
 .INCLUDE :  settings.mk
 
 # --- Files --------------------------------------------------------
@@ -45,6 +47,7 @@ SMDLL=TRUE
 SRS2NAME =smres
 SRC2FILES = smres.src   \
             symbol.src	\
+            toolbox.src \
             commands.src
 
 SLO1FILES =  \
@@ -84,24 +87,6 @@ SLOFILES = \
     $(SLO1FILES) \
     $(SLO2FILES)
 
-EXCEPTIONSFILES =   \
-        $(SLO)$/register.obj  \
-        $(SLO)$/accessibility.obj \
-        $(SLO)$/cfgitem.obj \
-        $(SLO)$/dialog.obj \
-        $(SLO)$/document.obj \
-        $(SLO)$/node.obj \
-        $(SLO)$/parse.obj \
-        $(SLO)$/mathmlimport.obj \
-        $(SLO)$/mathmlexport.obj \
-        $(SLO)$/mathtype.obj \
-        $(SLO)$/smdll.obj \
-        $(SLO)$/view.obj \
-        $(SLO)$/unomodel.obj \
-        $(SLO)$/smdetect.obj \
-        $(SLO)$/symbol.obj \
-        $(SLO)$/unodoc.obj
-
 LIB1TARGET = \
     $(SLB)$/$(TARGET).lib
 
diff --git a/starmath/source/mathmlexport.cxx b/starmath/source/mathmlexport.cxx
index 36eb9d3884b5..bec69eb01b95 100644
--- a/starmath/source/mathmlexport.cxx
+++ b/starmath/source/mathmlexport.cxx
@@ -75,7 +75,6 @@
 #include <memory>
 
 #include "mathmlexport.hxx"
-#include "mathtype.hxx"
 #include <starmath.hrc>
 #include <unomodel.hxx>
 #include <document.hxx>
diff --git a/starmath/source/mathmlimport.cxx b/starmath/source/mathmlimport.cxx
index dd90caaf6d45..36c009757eac 100644
--- a/starmath/source/mathmlimport.cxx
+++ b/starmath/source/mathmlimport.cxx
@@ -71,7 +71,6 @@ one go*/
 #include <memory>
 
 #include "mathmlimport.hxx"
-#include "mathtype.hxx"
 #include <starmath.hrc>
 #include <unomodel.hxx>
 #include <document.hxx>
diff --git a/starmath/source/node.cxx b/starmath/source/node.cxx
index 4601b2f84fec..d8e2586e151e 100644..100755
--- a/starmath/source/node.cxx
+++ b/starmath/source/node.cxx
@@ -28,7 +28,14 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_starmath.hxx"
 
-#define APPEND(str,ascii) str.AppendAscii(RTL_CONSTASCII_STRINGPARAM(ascii))
+#include "node.hxx"
+#include "rect.hxx"
+#include "symbol.hxx"
+#include "smmod.hxx"
+#include "document.hxx"
+#include "view.hxx"
+#include "mathtype.hxx"
+
 #include <tools/gen.hxx>
 #include <tools/fract.hxx>
 #include <rtl/math.hxx>
@@ -38,23 +45,19 @@
 #include <vcl/outdev.hxx>
 #include <sfx2/module.hxx>
 
-
-#include "node.hxx"
-#include <rect.hxx>
-#include "symbol.hxx"
-#include "smmod.hxx"
-#include <document.hxx>
-#include <view.hxx>
-#ifndef _MATHTYPE_HXX
-#include "mathtype.hxx"
-#endif
-
 #include <math.h>
 #include <float.h>
 
+
+#define APPEND(str,ascii) str.AppendAscii(RTL_CONSTASCII_STRINGPARAM(ascii))
+
 // define this to draw rectangles for debugging
 //#define SM_RECT_DEBUG
 
+
+using ::rtl::OUString;
+
+
 ////////////////////////////////////////
 // SmTmpDevice
 // Allows for font and color changes. The original settings will be restored
@@ -2355,6 +2358,20 @@ void SmRectangleNode::Draw(OutputDevice &rDev, const Point &rPosition) const
 /**************************************************************************/
 
 
+SmTextNode::SmTextNode( SmNodeType eNodeType, const SmToken &rNodeToken, USHORT nFontDescP ) :
+    SmVisibleNode(eNodeType, rNodeToken)
+{
+    nFontDesc = nFontDescP;
+}
+
+
+SmTextNode::SmTextNode( const SmToken &rNodeToken, USHORT nFontDescP ) :
+    SmVisibleNode(NTEXT, rNodeToken)
+{
+    nFontDesc = nFontDescP;
+}
+
+
 void SmTextNode::Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell)
 {
     SmNode::Prepare(rFormat, rDocShell);
@@ -2459,6 +2476,12 @@ void SmTextNode::Draw(OutputDevice &rDev, const Point& rPosition) const
     // auf Pixelkoordinaten runden
     aPos = rDev.PixelToLogic( rDev.LogicToPixel(aPos) );
 
+#if OSL_DEBUG_LEVEL > 1
+    sal_Int32 nPos = 0;
+    sal_UCS4 cChar = OUString( aText ).iterateCodePoints( &nPos );
+    (void) cChar;
+#endif
+
     rDev.DrawStretchText(aPos, GetWidth(), aText);
 
 #ifdef SM_RECT_DEBUG
@@ -2798,6 +2821,36 @@ void SmAttributNode::CreateTextFromNode(String &rText)
 
 /**************************************************************************/
 
+bool lcl_IsFromGreekSymbolSet( const String &rTokenText )
+{
+    bool bRes = false;
+
+    // valid symbol name needs to have a '%' at pos 0 and at least an additonal char
+    if (rTokenText.Len() > 2 && rTokenText.GetBuffer()[0] == (sal_Unicode)'%')
+    {
+        String aName( rTokenText.Copy(1) );
+        SmSym *pSymbol = SM_MOD()->GetSymbolManager().GetSymbolByName( aName );
+        if (pSymbol && GetExportSymbolSetName( pSymbol->GetSymbolSetName() ).EqualsAscii( "Greek" ) )
+            bRes = true;
+    }
+
+    return bRes;
+}
+
+
+SmSpecialNode::SmSpecialNode(SmNodeType eNodeType, const SmToken &rNodeToken, USHORT _nFontDesc) :
+    SmTextNode(eNodeType, rNodeToken, _nFontDesc)
+{
+    bIsFromGreekSymbolSet = lcl_IsFromGreekSymbolSet( rNodeToken.aText );
+}
+
+
+SmSpecialNode::SmSpecialNode(const SmToken &rNodeToken) :
+    SmTextNode(NSPECIAL, rNodeToken, FNT_MATH)  //! default Font nicht immer richtig
+{
+    bIsFromGreekSymbolSet = lcl_IsFromGreekSymbolSet( rNodeToken.aText );
+}
+
 
 void SmSpecialNode::Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell)
 {
@@ -2806,9 +2859,12 @@ void SmSpecialNode::Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell
     const SmSym   *pSym;
     SmModule  *pp = SM_MOD();
 
-    if (NULL != (pSym = pp->GetSymbolManager().GetSymbolByName(GetToken().aText)))
+    String aName( GetToken().aText.Copy(1) );
+    if (NULL != (pSym = pp->GetSymbolManager().GetSymbolByName( aName )))
     {
-        SetText( pSym->GetCharacter() );
+        sal_UCS4 cChar = pSym->GetCharacter();
+        String aTmp( OUString( &cChar, 1 ) );
+        SetText( aTmp );
         GetFont() = pSym->GetFace();
     }
     else
@@ -2832,6 +2888,33 @@ void SmSpecialNode::Prepare(const SmFormat &rFormat, const SmDocShell &rDocShell
         SetAttribut(ATTR_BOLD);
 
     Flags() |= FLG_FONT;
+
+    if (bIsFromGreekSymbolSet)
+    {
+        DBG_ASSERT( GetText().Len() == 1, "a symbol should only consist of 1 char!" );
+        bool bItalic = false;
+        INT16 nStyle = rFormat.GetGreekCharStyle();
+        DBG_ASSERT( nStyle >= 0 && nStyle <= 2, "unexpected value for GreekCharStyle" );
+        if (nStyle == 1)
+            bItalic = true;
+        else if (nStyle == 2)
+        {
+            String aTmp( GetText() );
+            if (aTmp.Len() > 0)
+            {
+                const sal_Unicode cUppercaseAlpha = 0x0391;
+                const sal_Unicode cUppercaseOmega = 0x03A9;
+                sal_Unicode cChar = aTmp.GetBuffer()[0];
+                // uppercase letters should be straight and lowercase letters italic
+                bItalic = !(cUppercaseAlpha <= cChar && cChar <= cUppercaseOmega);
+            }
+        }
+
+        if (bItalic)
+            Attributes() |= ATTR_ITALIC;
+        else
+            Attributes() &= ~ATTR_ITALIC;;
+    }
 };
 
 
diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 15971d0c38af..d12f3df07400 100644..100755
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -741,14 +741,14 @@ void SmParser::NextToken()
                         CurToken.nLevel     = 5;
                         CurToken.aText      = String();
                         CurToken.nRow       = sal::static_int_cast< xub_StrLen >(Row);
-                        CurToken.nCol       = nTmpStart - ColOff + 1;
+                        CurToken.nCol       = nTmpStart - ColOff;
 
                         if (aTmpRes.TokenType & KParseType::IDENTNAME)
                         {
 
                             xub_StrLen n = sal::static_int_cast< xub_StrLen >(aTmpRes.EndPos - nTmpStart);
                             CurToken.eType      = TSPECIAL;
-                            CurToken.aText      = BufferString.Copy( sal::static_int_cast< xub_StrLen >(nTmpStart), n );
+                            CurToken.aText      = BufferString.Copy( sal::static_int_cast< xub_StrLen >(nTmpStart-1), n+1 );
 
                             DBG_ASSERT( aTmpRes.EndPos > rnEndPos,
                                     "empty identifier" );
diff --git a/starmath/source/register.cxx b/starmath/source/register.cxx
index 0983d0a86ee4..a7e7ea2110a6 100644
--- a/starmath/source/register.cxx
+++ b/starmath/source/register.cxx
@@ -118,92 +118,6 @@ void SAL_CALL component_getImplementationEnvironment(
     *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ;
 }
 
-sal_Bool SAL_CALL component_writeInfo(  void*   /*pServiceManager*/,
-                                        void*   pRegistryKey    )
-{
-    Reference< registry::XRegistryKey >
-            xKey( reinterpret_cast< registry::XRegistryKey* >( pRegistryKey ) ) ;
-
-    OUString aDelimiter( RTL_CONSTASCII_USTRINGPARAM("/") );
-    OUString aUnoServices( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES") );
-
-    // Eigentliche Implementierung und ihre Services registrieren
-    sal_Int32 i;
-    Reference< registry::XRegistryKey >  xNewKey;
-
-    xNewKey = xKey->createKey( aDelimiter + SmXMLImport_getImplementationName() +
-                               aUnoServices );
-
-    Sequence< OUString > aServices = SmXMLImport_getSupportedServiceNames();
-    for(i = 0; i < aServices.getLength(); i++ )
-        xNewKey->createKey( aServices.getConstArray()[i] );
-
-    xNewKey = xKey->createKey( aDelimiter + SmXMLExport_getImplementationName() +
-                               aUnoServices );
-
-    aServices = SmXMLExport_getSupportedServiceNames();
-    for(i = 0; i < aServices.getLength(); i++ )
-        xNewKey->createKey( aServices.getConstArray()[i] );
-
-    xNewKey = xKey->createKey( aDelimiter + SmXMLImportMeta_getImplementationName() +
-                               aUnoServices );
-
-    aServices = SmXMLImportMeta_getSupportedServiceNames();
-    for(i = 0; i < aServices.getLength(); i++ )
-        xNewKey->createKey( aServices.getConstArray()[i] );
-
-    xNewKey = xKey->createKey( aDelimiter + SmXMLExportMetaOOO_getImplementationName() +
-                               aUnoServices );
-
-    aServices = SmXMLExportMetaOOO_getSupportedServiceNames();
-    for(i = 0; i < aServices.getLength(); i++ )
-        xNewKey->createKey( aServices.getConstArray()[i] );
-
-    xNewKey = xKey->createKey( aDelimiter + SmXMLExportMeta_getImplementationName() +
-                               aUnoServices );
-
-    aServices = SmXMLExportMeta_getSupportedServiceNames();
-    for(i = 0; i < aServices.getLength(); i++ )
-        xNewKey->createKey( aServices.getConstArray()[i] );
-
-    xNewKey = xKey->createKey( aDelimiter + SmXMLImportSettings_getImplementationName() +
-                               aUnoServices );
-
-    aServices = SmXMLImportSettings_getSupportedServiceNames();
-    for(i = 0; i < aServices.getLength(); i++ )
-        xNewKey->createKey( aServices.getConstArray()[i] );
-
-    xNewKey = xKey->createKey( aDelimiter + SmXMLExportSettingsOOO_getImplementationName() +
-                               aUnoServices );
-
-    aServices = SmXMLExportSettingsOOO_getSupportedServiceNames();
-    for(i = 0; i < aServices.getLength(); i++ )
-        xNewKey->createKey( aServices.getConstArray()[i] );
-
-    xNewKey = xKey->createKey( aDelimiter + SmXMLExportSettings_getImplementationName() +
-                               aUnoServices );
-
-    aServices = SmXMLExportSettings_getSupportedServiceNames();
-    for(i = 0; i < aServices.getLength(); i++ )
-        xNewKey->createKey( aServices.getConstArray()[i] );
-
-    xNewKey = xKey->createKey( aDelimiter + SmXMLExportContent_getImplementationName() +
-                               aUnoServices );
-
-    aServices = SmXMLExportContent_getSupportedServiceNames();
-    for(i = 0; i < aServices.getLength(); i++ )
-        xNewKey->createKey( aServices.getConstArray()[i] );
-
-    xNewKey = xKey->createKey( aDelimiter + SmDocument_getImplementationName() +
-                               aUnoServices );
-
-    aServices = SmDocument_getSupportedServiceNames();
-    for(i = 0; i < aServices.getLength(); i++ )
-        xNewKey->createKey( aServices.getConstArray()[i] );
-
-    return sal_True;
-}
-
 void* SAL_CALL component_getFactory( const sal_Char* pImplementationName,
                                      void* pServiceManager,
                                      void* /*pRegistryKey*/ )
diff --git a/starmath/source/smres.src b/starmath/source/smres.src
index 0ffa820b7a32..710081687d6e 100644..100755
--- a/starmath/source/smres.src
+++ b/starmath/source/smres.src
@@ -1148,7 +1148,7 @@ ModalDialog RID_SYMDEFINEDIALOG
     ComboBox 1
     {
         Pos = MAP_APPFONT ( 59 , 6 ) ;
-        Size = MAP_APPFONT ( 80 , 50 ) ;
+        Size = MAP_APPFONT ( 80 , 100 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
         Sort = TRUE ;
@@ -1163,7 +1163,7 @@ ModalDialog RID_SYMDEFINEDIALOG
     ComboBox 2
     {
         Pos = MAP_APPFONT ( 210 , 6 ) ;
-        Size = MAP_APPFONT ( 80 , 50 ) ;
+        Size = MAP_APPFONT ( 80 , 100 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
         Sort = TRUE ;
@@ -1187,7 +1187,7 @@ ModalDialog RID_SYMDEFINEDIALOG
     ComboBox 4
     {
         Pos = MAP_APPFONT ( 80 , 115 ) ;
-        Size = MAP_APPFONT ( 100 , 80 ) ;
+        Size = MAP_APPFONT ( 100 , 100 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
         Sort = TRUE ;
@@ -1202,7 +1202,7 @@ ModalDialog RID_SYMDEFINEDIALOG
     ComboBox 5
     {
         Pos = MAP_APPFONT ( 80 , 130 ) ;
-        Size = MAP_APPFONT ( 100 , 50 ) ;
+        Size = MAP_APPFONT ( 100 , 100 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
         Sort = TRUE ;
@@ -1218,7 +1218,7 @@ ModalDialog RID_SYMDEFINEDIALOG
     {
         Border = TRUE ;
         Pos = MAP_APPFONT ( 80 , 145 ) ;
-        Size = MAP_APPFONT ( 100 , 50 ) ;
+        Size = MAP_APPFONT ( 100 , 100 ) ;
         TabStop = TRUE ;
         Sort = TRUE ;
         DropDown = TRUE ;
@@ -1234,7 +1234,7 @@ ModalDialog RID_SYMDEFINEDIALOG
     {
         Border = TRUE ;
         Pos = MAP_APPFONT ( 80 , 160 ) ;
-        Size = MAP_APPFONT ( 100 , 50 ) ;
+        Size = MAP_APPFONT ( 100 , 100 ) ;
         TabStop = TRUE ;
         Sort = FALSE ;
         DropDown = TRUE ;
@@ -1250,7 +1250,7 @@ ModalDialog RID_SYMDEFINEDIALOG
     {
         Border = TRUE;
         Pos = MAP_APPFONT ( 80 , 175 ) ;
-        Size = MAP_APPFONT ( 100 , 50 ) ;
+        Size = MAP_APPFONT ( 100 , 100 ) ;
         TabStop = TRUE ;
         DropDown = TRUE ;
         Sort = FALSE ;
@@ -1380,10 +1380,6 @@ String RID_OBJECTNAME
 {
     Text = "SMath3" ;
 };
-String RID_VIEWNAME
-{
-    Text = "StarMath" ;
-};
 String RID_UNDOEDITNAME
 {
     Text = "Edit" ;
@@ -1547,1420 +1543,6 @@ Menu RID_FONTMENU
     };
 };
 
-FloatingWindow RID_TOOLBOXWINDOW
-{
-    HelpId = HID_SMA_OPERATOR_WIN ;
-    Border = TRUE ;
-    Moveable = TRUE ;
-    Closeable = TRUE ;
-    Hide = TRUE ;
-    OutputSize = TRUE ;
-    SVLook = TRUE ;
-    Size = MAP_APPFONT ( 0 , 0 ) ;
-    Text [ en-US ] = "Elements" ;
-
-    ToolBox 1
-    {
-        // unary/binary operators
-        HelpId = HID_SMA_UNBINOPS_TBX ;
-        Pos = MAP_APPFONT ( 0 , 45 ) ;
-        Size = MAP_APPFONT ( 65 , 95 ) ;
-        SVLook = TRUE ;
-        Hide = TRUE ;
-        LineCount = 4 ;
-
-        ItemList =
-        {
-            ToolBoxItem
-            {
-                Identifier = RID_PLUSX ;
-                HelpId = HID_SMA_PLUSX ;
-                Text [ en-US ] = "+ Sign" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_MINUSX ;
-                HelpId = HID_SMA_MINUSX ;
-                Text [ en-US ] = "- Sign" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_PLUSMINUSX ;
-                HelpId = HID_SMA_PLUSMINUSX ;
-                Text [ en-US ] = "+- Sign" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_MINUSPLUSX ;
-                HelpId = HID_SMA_MINUSPLUSX ;
-                Text [ en-US ] = "-+ Sign" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_NEGX ;
-                HelpId = HID_SMA_NEGX ;
-                Text [ en-US ] = "Boolean NOT" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XPLUSY ;
-                HelpId = HID_SMA_XPLUSY ;
-                Text [ en-US ] = "Addition +" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XCDOTY ;
-                HelpId = HID_SMA_XCDOTY ;
-                Text [ en-US ] = "Multiplication (Dot )" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XTIMESY ;
-                HelpId = HID_SMA_XTIMESY ;
-                Text [ en-US ] = "Multiplication (x)" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XSYMTIMESY ;
-                HelpId = HID_SMA_XSYMTIMESY ;
-                Text [ en-US ] = "Multiplication (*)" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XANDY ;
-                HelpId = HID_SMA_XANDY ;
-                Text [ en-US ] = "Boolean AND" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XMINUSY ;
-                HelpId = HID_SMA_XMINUSY ;
-                Text [ en-US ] = "Subtraction -" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XOVERY ;
-                HelpId = HID_SMA_XOVERY ;
-                Text [ en-US ] = "Division (Fraction)" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XDIVY ;
-                HelpId = HID_SMA_XDIVY ;
-                Text [ en-US ] = "Division (÷)" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XSYMDIVIDEY ;
-                HelpId = HID_SMA_XSYMDIVIDEY ;
-                Text [ en-US ] = "Division (Slash)" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XORY ;
-                HelpId = HID_SMA_XORY ;
-                Text [ en-US ] = "Boolean OR" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XCIRCY ;
-                HelpId = HID_SMA_XCIRCY ;
-                Text [ en-US ] = "Concatenate";
-            };
-        };
-    };
-    ToolBox 2
-    {
-        // relations
-        HelpId = HID_SMA_RELATIONS_TBX ;
-        Pos = MAP_APPFONT ( 0 , 45 ) ;
-        Size = MAP_APPFONT ( 65 , 95 ) ;
-        SVLook = TRUE ;
-        Hide = TRUE ;
-        LineCount = 5 ;
-        ItemList =
-        {
-            ToolBoxItem
-            {
-                Identifier = RID_XEQY ;
-                HelpId = HID_SMA_XEQY ;
-                Text [ en-US ] = "Is Equal" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XNEQY ;
-                HelpId = HID_SMA_XNEQY ;
-                Text [ en-US ] = "Is Not Equal" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XAPPROXY ;
-                HelpId = HID_SMA_XAPPROXY ;
-                Text [ en-US ] = "Is Approximately Equal" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XDIVIDESY ;
-                HelpId = HID_SMA_XDIVIDESY ;
-                Text [ en-US ] = "Divides";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XNDIVIDESY ;
-                HelpId = HID_SMA_XNDIVIDESY ;
-                Text [ en-US ] = "Does Not Divide";
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XLTY ;
-                HelpId = HID_SMA_XLTY ;
-                Text [ en-US ] = "Is Less Than" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XGTY ;
-                HelpId = HID_SMA_XGTY ;
-                Text [ en-US ] = "Is Greater Than" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XSIMEQY ;
-                HelpId = HID_SMA_XSIMEQY ;
-                /* ### ACHTUNG: Neuer Text in Resource? ist �hnlich oder gleich : ist �hnlich oder glech */
-                Text [ en-US ] = "Is Similar Or Equal" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XPARALLELY ;
-                HelpId = HID_SMA_XPARALLELY ;
-                Text [ en-US ] = "Is Parallel To" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XORTHOY ;
-                HelpId = HID_SMA_XORTHOY ;
-                Text [ en-US ] = "Is Orthogonal To" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XLESLANTY ;
-                HelpId = HID_SMA_XLESLANTY ;
-                Text [ en-US ] = "Is Less Than Or Equal To" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XGESLANTY ;
-                HelpId = HID_SMA_XGESLANTY ;
-                Text [ en-US ] = "Is Greater Than Or Equal To" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XSIMY ;
-                HelpId = HID_SMA_XSIMY ;
-                Text [ en-US ] = "Is Similar To" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XEQUIVY ;
-                HelpId = HID_SMA_XEQUIVY ;
-                Text [ en-US ] = "Is Congruent To" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_SPACE ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XLEY ;
-                HelpId = HID_SMA_XLEY ;
-                Text [ en-US ] = "Is Less Than Or Equal To" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XGEY ;
-                HelpId = HID_SMA_XGEY ;
-                Text [ en-US ] = "Is Greater Than Or Equal To" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XPROPY ;
-                HelpId = HID_SMA_XPROPY ;
-                Text [ en-US ] = "Is Proportional To" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XTOWARDY ;
-                HelpId = HID_SMA_XTOWARDY ;
-                Text [ en-US ] = "Toward" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_SPACE ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_DLARROW ;
-                HelpId = HID_SMA_DLARROW ;
-                Text [ en-US ] = "Double Arrow Left";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_DLRARROW ;
-                HelpId = HID_SMA_DLRARROW ;
-                Text [ en-US ] = "Double Arrow Left And Right";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_DRARROW ;
-                HelpId = HID_SMA_DRARROW ;
-                Text [ en-US ] = "Double Arrow Right";
-            };
-        };
-    };
-    ToolBox 3
-    {
-        // set operations
-        HelpId = HID_SMA_SETOPERATIONS_TBX ;
-        Pos = MAP_APPFONT ( 0 , 45 ) ;
-        Size = MAP_APPFONT ( 65 , 95 ) ;
-        SVLook = TRUE ;
-        Hide = TRUE ;
-        LineCount = 5 ;
-        ItemList =
-        {
-            ToolBoxItem
-            {
-                Identifier = RID_XINY ;
-                HelpId = HID_SMA_XINY ;
-                Text [ en-US ] = "Is In" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XNOTINY ;
-                HelpId = HID_SMA_XNOTINY ;
-                Text [ en-US ] = "Is Not In" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XOWNSY ;
-                HelpId = HID_SMA_XOWNSY ;
-                Text [ en-US ] = "Owns" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_SPACE ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_EMPTYSET ;
-                HelpId = HID_SMA_EMPTYSET ;
-                Text [ en-US ] = "Empty Set";
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XINTERSECTIONY ;
-                HelpId = HID_SMA_XINTERSECTIONY ;
-                Text [ en-US ] = "Intersection" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XUNIONY ;
-                HelpId = HID_SMA_XUNIONY ;
-                Text [ en-US ] = "Union" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XSETMINUSY ;
-                HelpId = HID_SMA_XSETMINUSY ;
-                Text [ en-US ] = "Difference" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XSLASHY ;
-                HelpId = HID_SMA_XSLASHY ;
-                Text [ en-US ] = "Quotient Set" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_ALEPH ;
-                HelpId = HID_SMA_ALEPH ;
-                Text [ en-US ] = "Aleph";
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XSUBSETY ;
-                HelpId = HID_SMA_XSUBSETY ;
-                Text [ en-US ] = "Subset" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XSUBSETEQY ;
-                HelpId = HID_SMA_XSUBSETEQY ;
-                Text [ en-US ] = "Subset Or Equal To" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XSUPSETY ;
-                HelpId = HID_SMA_XSUPSETY ;
-                Text [ en-US ] = "Superset" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XSUPSETEQY ;
-                HelpId = HID_SMA_XSUPSETEQY ;
-                Text [ en-US ] = "Superset Or Equal To" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_SPACE ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XNSUBSETY ;
-                HelpId = HID_SMA_XNSUBSETY ;
-                Text [ en-US ] = "Not Subset" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XNSUBSETEQY ;
-                HelpId = HID_SMA_XNSUBSETEQY ;
-                Text [ en-US ] = "Not Subset Or Equal" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XNSUPSETY ;
-                HelpId = HID_SMA_XNSUPSETY ;
-                Text [ en-US ] = "Not Superset" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XNSUPSETEQY ;
-                HelpId = HID_SMA_XNSUPSETEQY ;
-                Text [ en-US ] = "Not Superset Or Equal" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_SPACE ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_SETN ;
-                HelpId = HID_SMA_SETN ;
-                Text [ en-US ] = "Natural Numbers Set";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_SETZ ;
-                HelpId = HID_SMA_SETZ ;
-                Text [ en-US ] = "Integers Set";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_SETQ ;
-                HelpId = HID_SMA_SETQ ;
-                Text [ en-US ] = "Set of Rational Numbers";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_SETR ;
-                HelpId = HID_SMA_SETR ;
-                Text [ en-US ] = "Real Numbers Set";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_SETC ;
-                HelpId = HID_SMA_SETC ;
-                Text [ en-US ] = "Complex Numbers Set";
-            };
-        };
-    };
-    ToolBox 4
-    {
-        // functions
-        HelpId = HID_SMA_FUNCTIONS_TBX ;
-        Pos = MAP_APPFONT ( 0 , 45 ) ;
-        Size = MAP_APPFONT ( 65 , 95 ) ;
-        SVLook = TRUE ;
-        Hide = TRUE ;
-        LineCount = 5 ;
-        ItemList =
-        {
-            ToolBoxItem
-            {
-                Identifier = RID_EX ;
-                HelpId = HID_SMA_EX ;
-                Text [ en-US ] = "Exponential Function" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_LNX ;
-                HelpId = HID_SMA_LNX ;
-                Text [ en-US ] = "Natural Logarithm" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_EXPX ;
-                HelpId = HID_SMA_EXPX ;
-                Text [ en-US ] = "Exponential Function" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_LOGX ;
-                HelpId = HID_SMA_LOGX ;
-                Text [ en-US ] = "Logarithm" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_RSUPX ;
-                HelpId = HID_SMA_RSUPX ;
-                Text [ en-US ] = "Power";
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_SINX ;
-                HelpId = HID_SMA_SINX ;
-                Text [ en-US ] = "Sine" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_COSX ;
-                HelpId = HID_SMA_COSX ;
-                Text [ en-US ] = "Cosine" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_TANX ;
-                HelpId = HID_SMA_TANX ;
-                Text [ en-US ] = "Tangent" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_COTX ;
-                HelpId = HID_SMA_COTX ;
-                Text [ en-US ] = "Cotangent" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_SQRTX ;
-                HelpId = HID_SMA_SQRTX ;
-                Text [ en-US ] = "Square Root" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_ARCSINX ;
-                HelpId = HID_SMA_ARCSINX ;
-                Text [ en-US ] = "Arcsine" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_ARCCOSX ;
-                HelpId = HID_SMA_ARCCOSX ;
-                Text [ en-US ] = "Arccosine" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_ARCTANX ;
-                HelpId = HID_SMA_ARCTANX ;
-                Text [ en-US ] = "Arctangent" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_ARCCOTX ;
-                HelpId = HID_SMA_ARCCOTX ;
-                Text [ en-US ] = "Arccotangent" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_NROOTXY ;
-                HelpId = HID_SMA_NROOTXY ;
-                Text [ en-US ] = "N-th Root" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_SINHX ;
-                HelpId = HID_SMA_SINHX ;
-                Text [ en-US ] = "Hyperbolic Sine" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_COSHX ;
-                HelpId = HID_SMA_COSHX ;
-                Text [ en-US ] = "Hyperbolic Cosine" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_TANHX ;
-                HelpId = HID_SMA_TANHX ;
-                Text [ en-US ] = "Hyperbolic Tangent" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_COTHX ;
-                HelpId = HID_SMA_COTHX ;
-                Text [ en-US ] = "Hyperbolic Cotangent" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_ABSX ;
-                HelpId = HID_SMA_ABSX ;
-                Text [ en-US ] = "Absolute Value" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_ARSINHX ;
-                HelpId = HID_SMA_ARSINHX ;
-                Text [ en-US ] = "Area Hyperbolic Sine" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_ARCOSHX ;
-                HelpId = HID_SMA_ARCOSHX ;
-                Text [ en-US ] = "Area Hyperbolic Cosine" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_ARTANHX ;
-                HelpId = HID_SMA_ARTANHX ;
-                Text [ en-US ] = "Area Hyperbolic Tangent" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_ARCOTHX ;
-                HelpId = HID_SMA_ARCOTHX ;
-                Text [ en-US ] = "Area Hyperbolic Cotangent" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_FACTX ;
-                HelpId = HID_SMA_FACTX ;
-                Text [ en-US ] = "Factorial" ;
-            };
-        };
-    };
-    ToolBox 5
-    {
-        // operators
-        HelpId = HID_SMA_OPERATORS_TBX ;
-        Pos = MAP_APPFONT ( 0 , 45 ) ;
-        Size = MAP_APPFONT ( 65 , 95 ) ;
-        SVLook = TRUE ;
-        Hide = TRUE ;
-        LineCount = 3 ;
-        ItemList =
-        {
-            ToolBoxItem
-            {
-                Identifier = RID_LIMX ;
-                HelpId = HID_SMA_LIMX ;
-                Text [ en-US ] = "Limes" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_SUMX ;
-                HelpId = HID_SMA_SUMX ;
-                Text [ en-US ] = "Sum" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_PRODX ;
-                HelpId = HID_SMA_PRODX ;
-                Text [ en-US ] = "Product" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_COPRODX ;
-                HelpId = HID_SMA_COPRODX ;
-                Text [ en-US ] = "Coproduct" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_FROMXTOY ;
-                HelpId = HID_SMA_FROMXTOY ;
-                Text [ en-US ] = "Upper And Lower Limit" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_INTX ;
-                HelpId = HID_SMA_INTX ;
-                Text [ en-US ] = "Integral" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_IINTX ;
-                HelpId = HID_SMA_IINTX ;
-                Text [ en-US ] = "Double Integral" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_IIINTX ;
-                HelpId = HID_SMA_IIINTX ;
-                Text [ en-US ] = "Triple Integral" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_SPACE ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_FROMX ;
-                HelpId = HID_SMA_FROMX ;
-                Text [ en-US ] = "Lower Limit" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_LINTX ;
-                HelpId = HID_SMA_LINTX ;
-                Text [ en-US ] = "Curve Integral" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_LLINTX ;
-                HelpId = HID_SMA_LLINTX ;
-                Text [ en-US ] = "Double Curve Integral" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_LLLINTX ;
-                HelpId = HID_SMA_LLLINTX ;
-                Text [ en-US ] = "Triple Curve Integral" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_SPACE ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_TOX ;
-                HelpId = HID_SMA_TOX ;
-                Text [ en-US ] = "Upper Limit" ;
-            };
-        };
-    };
-    ToolBox 6
-    {
-        // attributs
-        HelpId = HID_SMA_ATTRIBUTES_TBX ;
-        Pos = MAP_APPFONT ( 0 , 45 ) ;
-        Size = MAP_APPFONT ( 65 , 95 ) ;
-        SVLook = TRUE ;
-        Hide = TRUE ;
-        LineCount = 5 ;
-        ItemList =
-        {
-            ToolBoxItem
-            {
-                Identifier = RID_ACUTEX ;
-                HelpId = HID_SMA_ACUTEX ;
-                Text [ en-US ] = "Acute Accent";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_GRAVEX ;
-                HelpId = HID_SMA_GRAVEX ;
-                Text [ en-US ] = "Grave Accent";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_CHECKX ;
-                HelpId = HID_SMA_CHECKX ;
-                Text [ en-US ] = "Reverse Circumflex" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_BREVEX ;
-                HelpId = HID_SMA_BREVEX ;
-                Text [ en-US ] = "Breve" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_CIRCLEX ;
-                HelpId = HID_SMA_CIRCLEX ;
-                Text [ en-US ] = "Circle" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_VECX ;
-                HelpId = HID_SMA_VECX ;
-                Text [ en-US ] = "Vector Arrow" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_TILDEX ;
-                HelpId = HID_SMA_TILDEX ;
-                Text [ en-US ] = "Tilde" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_HATX ;
-                HelpId = HID_SMA_HATX ;
-                Text [ en-US ] = "Circumflex" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_BARX ;
-                HelpId = HID_SMA_BARX ;
-                Text [ en-US ] = "Line Above" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_DOTX ;
-                HelpId = HID_SMA_DOTX ;
-                Text [ en-US ] = "Dot" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_WIDEVECX ;
-                HelpId = HID_SMA_WIDEVECX ;
-                Text [ en-US ] = "Large Vector Arrow";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_WIDETILDEX ;
-                HelpId = HID_SMA_WIDETILDEX ;
-                Text [ en-US ] = "Large Tilde";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_WIDEHATX ;
-                HelpId = HID_SMA_WIDEHATX ;
-                Text [ en-US ] = "Large Circumflex";
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_SPACE ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_DDOTX ;
-                HelpId = HID_SMA_DDOTX ;
-                Text [ en-US ] = "Double Dot" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_OVERLINEX ;
-                HelpId = HID_SMA_OVERLINEX ;
-                Text [ en-US ] = "Line Over" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_UNDERLINEX ;
-                HelpId = HID_SMA_UNDERLINEX ;
-                Text [ en-US ] = "Line Below" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_OVERSTRIKEX ;
-                HelpId = HID_SMA_OVERSTRIKEX ;
-                Text [ en-US ] = "Line Through" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_SPACE ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_DDDOTX ;
-                HelpId = HID_SMA_DDDOTX ;
-                Text [ en-US ] = "Triple Dot" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_PHANTOMX ;
-                HelpId = HID_SMA_PHANTOMX ;
-                Text [ en-US ] = "Transparent" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_BOLDX ;
-                HelpId = HID_SMA_BOLDX ;
-                Text [ en-US ] = "Bold Font" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_ITALX ;
-                HelpId = HID_SMA_ITALX ;
-                Text [ en-US ] = "Italic Font" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_SIZEXY ;
-                HelpId = HID_SMA_SIZEXY ;
-                Text [ en-US ] = "Resize" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_FONTXY ;
-                HelpId = HID_SMA_FONTXY ;
-                Text [ en-US ] = "Change Font" ;
-            };
-        };
-    };
-    ToolBox 7
-    {
-        // parentheses
-        HelpId = HID_SMA_BRACKETS_TBX ;
-        Pos = MAP_APPFONT ( 0 , 45 ) ;
-        Size = MAP_APPFONT ( 65 , 95 ) ;
-        SVLook = TRUE ;
-        Hide = TRUE ;
-        LineCount = 5 ;
-        ItemList =
-        {
-            ToolBoxItem
-            {
-                Identifier = RID_LRPARENTX ;
-                HelpId = HID_SMA_LRPARENTX ;
-                Text [ en-US ] = "Round Brackets" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_LRBRACKETX ;
-                HelpId = HID_SMA_LRBRACKETX ;
-                Text [ en-US ] = "Square Brackets" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_LRDBRACKETX ;
-                HelpId = HID_SMA_LRDBRACKETX ;
-                Text [ en-US ] = "Double Square Brackets";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_LRLINEX ;
-                HelpId = HID_SMA_LRLINEX ;
-                Text [ en-US ] = "Single Lines" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_LRDLINEX ;
-                HelpId = HID_SMA_LRDLINEX ;
-                Text [ en-US ] = "Double Lines" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_LRBRACEX ;
-                HelpId = HID_SMA_LRBRACEX ;
-                Text [ en-US ] = "Braces" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_LRANGLEX ;
-                HelpId = HID_SMA_LRANGLEX ;
-                Text [ en-US ] = "Angle Brackets" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_LMRANGLEXY ;
-                HelpId = HID_SMA_LMRANGLEXY ;
-                Text [ en-US ] = "Operator Brackets";
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_SPACE ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_LRGROUPX ;
-                HelpId = HID_SMA_LRGROUPX ;
-                Text [ en-US ] = "Group Brackets" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_SLRPARENTX ;
-                HelpId = HID_SMA_SLRPARENTX ;
-                Text [ en-US ] = "Round Brackets (Scalable)" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_SLRBRACKETX ;
-                HelpId = HID_SMA_SLRBRACKETX ;
-                Text [ en-US ] = "Square Brackets (Scalable)" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_SLRDBRACKETX ;
-                HelpId = HID_SMA_SLRDBRACKETX ;
-                Text [ en-US ] = "Double Square Brackets (Scalable)";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_SLRLINEX ;
-                HelpId = HID_SMA_SLRLINEX ;
-                Text [ en-US ] = "Single Lines (Scalable)" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_SLRDLINEX ;
-                HelpId = HID_SMA_SLRDLINEX ;
-                Text [ en-US ] = "Double Lines (Scalable)" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_SLRBRACEX ;
-                HelpId = HID_SMA_SLRBRACEX ;
-                Text [ en-US ] = "Braces (Scalable)" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_SLRANGLEX ;
-                HelpId = HID_SMA_SLRANGLEX ;
-                Text [ en-US ] = "Angle Brackets (Scalable)" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_SLMRANGLEXY ;
-                HelpId = HID_SMA_SLMRANGLEXY ;
-                Text [ en-US ] = "Operator Brackets (Scalable)";
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XOVERBRACEY ;
-                HelpId = HID_SMA_XOVERBRACEY ;
-                Text [ en-US ] = "Braces Top (Scalable)";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_XUNDERBRACEY ;
-                HelpId = HID_SMA_XUNDERBRACEY ;
-                Text [ en-US ] = "Braces Bottom (Scalable)";
-            };
-        };
-    };
-    ToolBox 8
-    {
-        // format
-        HelpId = HID_SMA_FORMAT_TBX ;
-        Pos = MAP_APPFONT ( 0 , 45 ) ;
-        Size = MAP_APPFONT ( 65 , 95 ) ;
-        SVLook = TRUE ;
-        Hide = TRUE ;
-        LineCount = 3 ;
-        ItemList =
-        {
-            ToolBoxItem
-            {
-                Identifier = RID_LSUPX ;
-                HelpId = HID_SMA_LSUPX ;
-                Text [ en-US ] = "Superscript Left" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_CSUPX ;
-                HelpId = HID_SMA_CSUPX ;
-                Text [ en-US ] = "Superscript Top";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_RSUPX ;
-                HelpId = HID_SMA_RSUPX ;
-                Text [ en-US ] = "Superscript Right" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_BINOMXY ;
-                HelpId = HID_SMA_BINOMXY ;
-                Text [ en-US ] = "Vertical Stack (2 Elements)" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_NEWLINE ;
-                HelpId = HID_SMA_NEWLINE ;
-                Text [ en-US ] = "New Line" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_LSUBX ;
-                HelpId = HID_SMA_LSUBX ;
-                Text [ en-US ] = "Subscript Left" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_CSUBX ;
-                HelpId = HID_SMA_CSUBX ;
-                Text [ en-US ] = "Subscript Bottom";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_RSUBX ;
-                HelpId = HID_SMA_RSUBX ;
-                Text [ en-US ] = "Subscript Right" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_STACK ;
-                HelpId = HID_SMA_STACK ;
-                Text [ en-US ] = "Vertical Stack" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_SBLANK ;
-                HelpId = HID_SMA_SBLANK ;
-                Text [ en-US ] = "Small Gap" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_ALIGNLX ;
-                HelpId = HID_SMA_ALIGNLX ;
-                Text [ en-US ] = "Align Left" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_ALIGNCX ;
-                HelpId = HID_SMA_ALIGNCX ;
-                Text [ en-US ] = "Align Center" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_ALIGNRX ;
-                HelpId = HID_SMA_ALIGNRX ;
-                Text [ en-US ] = "Align Right" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_MATRIX ;
-                HelpId = HID_SMA_MATRIX ;
-                Text [ en-US ] = "Matrix Stack" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_BLANK ;
-                HelpId = HID_SMA_BLANK ;
-                Text [ en-US ] = "Gap" ;
-            };
-        };
-    };
-    ToolBox 9
-    {
-        // misc
-        HelpId = HID_SMA_FORMAT_TBX ;
-        Pos = MAP_APPFONT ( 0 , 45 ) ;
-        Size = MAP_APPFONT ( 65 , 95 ) ;
-        SVLook = TRUE ;
-        Hide = TRUE ;
-        LineCount = 4 ;
-        ItemList =
-        {
-            ToolBoxItem
-            {
-                Identifier = RID_INFINITY ;
-                HelpId = HID_SMA_INFINITY ;
-                Text [ en-US ] = "infinite";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_PARTIAL ;
-                HelpId = HID_SMA_PARTIAL ;
-                Text [ en-US ] = "Partial";
-            };
-            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_FORALL ;
-                HelpId = HID_SMA_FORALL ;
-                Text [ en-US ] = "For All";
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_HBAR ;
-                HelpId = HID_SMA_HBAR ;
-                Text [ en-US ] = "h Bar";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_LAMBDABAR ;
-                HelpId = HID_SMA_LAMBDABAR ;
-                Text [ en-US ] = "Lambda Bar";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_RE ;
-                HelpId = HID_SMA_RE ;
-                Text [ en-US ] = "Real Part";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_IM ;
-                HelpId = HID_SMA_IM ;
-                Text [ en-US ] = "Imaginary Part";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_WP ;
-                HelpId = HID_SMA_WP ;
-                Text [ en-US ] = "Weierstrass p";
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_LEFTARROW ;
-                HelpId = HID_SMA_LEFTARROW ;
-                Text [ en-US ] = "Left Arrow";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_RIGHTARROW ;
-                HelpId = HID_SMA_RIGHTARROW ;
-                Text [ en-US ] = "Right Arrow";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_UPARROW ;
-                HelpId = HID_SMA_UPARROW ;
-                Text [ en-US ] = "Up Arrow";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_DOWNARROW ;
-                HelpId = HID_SMA_DOWNARROW ;
-                Text [ en-US ] = "Down Arrow";
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_SPACE ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_DOTSLOW ;
-                HelpId = HID_SMA_DOTSLOW ;
-                Text [ en-US ] = "Dots At Bottom";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_DOTSAXIS ;
-                HelpId = HID_SMA_DOTSAXIS ;
-                Text [ en-US ] = "Dots In Middle";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_DOTSVERT ;
-                HelpId = HID_SMA_DOTSVERT ;
-                Text [ en-US ] = "Dots Vertically";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_DOTSUP ;
-                HelpId = HID_SMA_DOTSUP ;
-                Text [ en-US ] = "Dots To Top";
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_DOTSDOWN ;
-                HelpId = HID_SMA_DOTSDOWN ;
-                Text [ en-US ] = "Dots to Bottom";
-            };
-        };
-    };
-    ToolBox 10
-    {
-        // main menu of selection-window
-        HelpId = HID_SMA_SELECTION_TBX ;
-        Pos = MAP_APPFONT ( 0 , 0 ) ;
-        Size = MAP_APPFONT ( 65 , 38 ) ;
-        SVLook = TRUE ;
-        LineCount = 2 ;
-        ItemList =
-        {
-            ToolBoxItem
-            {
-                Identifier = RID_UNBINOPS_CAT ;
-                HelpId = HID_SMA_UNBINOPS_CAT ;
-                Text [ en-US ] = "Unary/Binary Operators" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_RELATIONS_CAT ;
-                HelpId = HID_SMA_RELATIONS_CAT ;
-                Text [ en-US ] = "Relations" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_SETOPERATIONS_CAT ;
-                HelpId = HID_SMA_SETOPERATIONS_CAT ;
-                Text [ en-US ] = "Set Operations" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_FUNCTIONS_CAT ;
-                HelpId = HID_SMA_FUNCTIONS_CAT ;
-                Text [ en-US ] = "Functions" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_OPERATORS_CAT ;
-                HelpId = HID_SMA_OPERATORS_CAT ;
-                Text [ en-US ] = "Operators" ;
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_BREAK ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_ATTRIBUTES_CAT ;
-                HelpId = HID_SMA_ATTRIBUTES_CAT ;
-                Text [ en-US ] = "Attributes" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_MISC_CAT ;
-                HelpId = HID_SMA_MISC_CAT ;
-                Text [ en-US ] = "Others";
-            };
-            ToolBoxItem
-            {
-                Type = TOOLBOXITEM_SPACE ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_BRACKETS_CAT ;
-                HelpId = HID_SMA_BRACKETS_CAT ;
-                Text [ en-US ] = "Brackets" ;
-            };
-            ToolBoxItem
-            {
-                Identifier = RID_FORMAT_CAT ;
-                HelpId = HID_SMA_FORMAT_CAT ;
-                Text [ en-US ] = "Formats" ;
-            };
-        };
-    };
-    FixedLine FL_TOOLBOX_CAT_DELIM
-    {
-        Pos = MAP_APPFONT ( 0 , 44 ) ;
-        Size = MAP_APPFONT ( 65 , 4 ) ;
-    };
-};
-
 #define CMDBOXWINDOW_TEXT           \
     Text [ en-US ] = "Commands" ;              \
 
@@ -2979,380 +1561,6 @@ DockingWindow RID_CMDBOXWINDOW\
 };
 
 
-#define UNBINOPS_IDLIST         \
-    IdList =                \
-    {                       \
-        RID_PLUSX ;         \
-        RID_MINUSX ;        \
-        RID_PLUSMINUSX ;    \
-        RID_MINUSPLUSX ;    \
-        RID_XPLUSY ;        \
-        RID_XCDOTY ;        \
-        RID_XTIMESY ;       \
-        RID_XSYMTIMESY ;    \
-        RID_XMINUSY ;       \
-        RID_XOVERY ;        \
-        RID_XDIVY ;         \
-        RID_XSYMDIVIDEY ;   \
-        RID_NEGX ;          \
-        RID_XANDY ;         \
-        RID_XORY ;          \
-        RID_XCIRCY ;        \
-    };                      \
-    IdCount = { 16 ; };
-
-    ImageList RID_IL_UNBINOPS
-    {
-        Prefix = "un";
-        MaskColor = IMAGE_STDBTN_COLOR ;
-        UNBINOPS_IDLIST
-    };
-    ImageList RID_ILH_UNBINOPS
-    {
-        Prefix = "unh";
-        MaskColor = IMAGE_STDBTN_COLOR_HC ;
-        UNBINOPS_IDLIST
-    };
-
-#define RELATIONS_IDLIST         \
-    IdList =                \
-    {                       \
-        RID_XEQY ;          \
-        RID_XNEQY ;         \
-        RID_XEQUIVY ;       \
-        RID_XORTHOY ;       \
-        RID_XLTY ;          \
-        RID_XGTY ;          \
-        RID_XAPPROXY ;      \
-        RID_XPARALLELY ;    \
-        RID_XLESLANTY ;     \
-        RID_XGESLANTY ;     \
-        RID_XSIMEQY ;       \
-        RID_XPROPY ;        \
-        RID_XLEY ;          \
-        RID_XGEY ;          \
-        RID_XSIMY ;         \
-        RID_XTOWARDY ;      \
-        RID_XDIVIDESY ;     \
-        RID_XNDIVIDESY;     \
-        RID_DLARROW ;       \
-        RID_DLRARROW ;      \
-        RID_DRARROW ;       \
-    };                      \
-    IdCount ={ 21 ; };
-
-    ImageList RID_IL_RELATIONS
-    {
-        Prefix = "bi";
-        MaskColor = IMAGE_STDBTN_COLOR ;
-        RELATIONS_IDLIST
-    };
-    ImageList RID_ILH_RELATIONS
-    {
-        Prefix = "bih";
-        MaskColor = IMAGE_STDBTN_COLOR_HC ;
-        RELATIONS_IDLIST
-    };
-
-#define SETOPERATIONS_IDLIST             \
-    IdList =                    \
-    {                           \
-        RID_XINY ;              \
-        RID_XNOTINY ;           \
-        RID_XOWNSY ;            \
-        RID_XINTERSECTIONY ;    \
-        RID_XUNIONY ;           \
-        RID_XSETMINUSY ;        \
-        RID_XSLASHY ;           \
-        RID_XSUBSETY ;          \
-        RID_XSUBSETEQY ;        \
-        RID_XSUPSETY ;          \
-        RID_XSUPSETEQY ;        \
-        RID_XNSUBSETY ;         \
-        RID_XNSUBSETEQY ;       \
-        RID_XNSUPSETY ;         \
-        RID_XNSUPSETEQY ;       \
-        RID_EMPTYSET ;          \
-        RID_ALEPH ;             \
-        RID_SETN ;              \
-        RID_SETZ ;              \
-        RID_SETQ ;              \
-        RID_SETR ;              \
-        RID_SETC ;              \
-    };                          \
-    IdCount = { 22 ; };
-
-    ImageList RID_IL_SETOPERATIONS
-    {
-        Prefix = "op";
-        MaskColor = IMAGE_STDBTN_COLOR ;
-        SETOPERATIONS_IDLIST
-    };
-    ImageList RID_ILH_SETOPERATIONS
-    {
-        Prefix = "oph";
-        MaskColor = IMAGE_STDBTN_COLOR_HC ;
-        SETOPERATIONS_IDLIST
-    };
-
-#define FUNCTIONS_IDLIST         \
-    IdList =                \
-    {                       \
-        RID_ABSX ;          \
-        RID_FACTX ;         \
-        RID_SQRTX ;         \
-        RID_NROOTXY ;       \
-        RID_EX ;            \
-        RID_LNX ;           \
-        RID_EXPX ;          \
-        RID_LOGX ;          \
-        RID_SINX ;          \
-        RID_COSX ;          \
-        RID_TANX ;          \
-        RID_COTX ;          \
-        RID_SINHX ;         \
-        RID_COSHX ;         \
-        RID_TANHX ;         \
-        RID_COTHX ;         \
-        RID_ARCSINX ;       \
-        RID_ARCCOSX ;       \
-        RID_ARCTANX ;       \
-        RID_ARCCOTX ;       \
-        RID_ARSINHX ;       \
-        RID_ARCOSHX ;       \
-        RID_ARTANHX ;       \
-        RID_ARCOTHX ;       \
-        RID_RSUPX ;         \
-    };                      \
-    IdCount = { 25 ; };
-
-    ImageList RID_IL_FUNCTIONS
-    {
-        Prefix = "fu";
-        MaskColor = IMAGE_STDBTN_COLOR ;
-        FUNCTIONS_IDLIST
-    };
-    ImageList RID_ILH_FUNCTIONS
-    {
-        Prefix = "fuh";
-        MaskColor = IMAGE_STDBTN_COLOR_HC ;
-        FUNCTIONS_IDLIST
-    };
-
-#define OPERATORS_IDLIST         \
-    IdList =                \
-    {                       \
-        RID_LIMX ;          \
-        RID_SUMX ;          \
-        RID_PRODX ;         \
-        RID_COPRODX ;       \
-        RID_INTX ;          \
-        RID_IINTX ;         \
-        RID_IIINTX ;        \
-        RID_LINTX ;         \
-        RID_LLINTX ;        \
-        RID_LLLINTX ;       \
-        RID_FROMXTOY ;      \
-        RID_FROMX ;         \
-        RID_TOX ;           \
-    };                      \
-    IdCount = { 13 ; };
-
-    ImageList RID_IL_OPERATORS
-    {
-        Prefix = "fo";
-        MaskColor = IMAGE_STDBTN_COLOR ;
-        OPERATORS_IDLIST
-    };
-    ImageList RID_ILH_OPERATORS
-    {
-        Prefix = "foh";
-        MaskColor = IMAGE_STDBTN_COLOR_HC ;
-        OPERATORS_IDLIST
-    };
-
-#define ATTRIBUTES_IDLIST             \
-    IdList =                    \
-    {                           \
-        RID_ACUTEX ;            \
-        RID_GRAVEX ;            \
-        RID_CHECKX ;            \
-        RID_BREVEX ;            \
-        RID_BARX ;              \
-        RID_VECX ;              \
-        RID_HATX ;              \
-        RID_TILDEX ;            \
-        RID_CIRCLEX ;           \
-        RID_DOTX ;              \
-        RID_DDOTX ;             \
-        RID_DDDOTX ;            \
-        RID_OVERLINEX ;         \
-        RID_UNDERLINEX ;        \
-        RID_OVERSTRIKEX ;       \
-        RID_PHANTOMX ;          \
-        RID_BOLDX ;             \
-        RID_ITALX ;             \
-        RID_SIZEXY ;            \
-        RID_FONTXY ;            \
-        RID_WIDEHATX ;          \
-        RID_WIDETILDEX ;        \
-        RID_WIDEVECX ;          \
-    };                          \
-    IdCount = { 23 ; };
-
-    ImageList RID_IL_ATTRIBUTES
-    {
-        Prefix = "at";
-        MaskColor = IMAGE_STDBTN_COLOR ;
-        ATTRIBUTES_IDLIST
-    };
-    ImageList RID_ILH_ATTRIBUTES
-    {
-        Prefix = "ath";
-        MaskColor = IMAGE_STDBTN_COLOR_HC ;
-        ATTRIBUTES_IDLIST
-    };
-
-#define BRACKETS_IDLIST             \
-    IdList =                    \
-    {                           \
-        RID_LRPARENTX ;         \
-        RID_LRBRACKETX ;        \
-        RID_LRANGLEX ;          \
-        RID_LRBRACEX ;          \
-        RID_LRLINEX ;           \
-        RID_LRDLINEX ;          \
-        RID_LMRANGLEXY ;        \
-        RID_LRGROUPX ;          \
-        RID_SLRPARENTX ;        \
-        RID_SLRBRACKETX ;       \
-        RID_SLRANGLEX ;         \
-        RID_SLRBRACEX ;         \
-        RID_SLRLINEX ;          \
-        RID_SLRDLINEX ;         \
-        RID_SLMRANGLEXY ;       \
-        RID_LRDBRACKETX ;       \
-        RID_SLRDBRACKETX ;      \
-        RID_XOVERBRACEY ;       \
-        RID_XUNDERBRACEY ;      \
-    };                          \
-    IdCount = { 19 ; };
-
-    ImageList RID_IL_BRACKETS
-    {
-        Prefix = "al";
-        MaskColor = IMAGE_STDBTN_COLOR ;
-        BRACKETS_IDLIST
-    };
-    ImageList RID_ILH_BRACKETS
-    {
-        Prefix = "alh";
-        MaskColor = IMAGE_STDBTN_COLOR_HC ;
-        BRACKETS_IDLIST
-    };
-
-#define FORMAT_IDLIST         \
-    IdList =                \
-    {                       \
-        RID_NEWLINE ;       \
-        RID_SBLANK ;        \
-        RID_BLANK ;         \
-        RID_BINOMXY ;       \
-        RID_STACK ;         \
-        RID_MATRIX ;        \
-        RID_ALIGNLX ;       \
-        RID_ALIGNCX ;       \
-        RID_ALIGNRX ;       \
-        RID_RSUBX ;         \
-        RID_RSUPX ;         \
-        RID_LSUBX ;         \
-        RID_LSUPX ;         \
-        RID_CSUBX ;         \
-        RID_CSUPX ;         \
-    };                      \
-    IdCount = { 15 ; };
-
-    ImageList RID_IL_FORMAT
-    {
-        Prefix = "co";
-        MaskColor = IMAGE_STDBTN_COLOR ;
-        FORMAT_IDLIST
-    };
-    ImageList RID_ILH_FORMAT
-    {
-        Prefix = "coh";
-        MaskColor = IMAGE_STDBTN_COLOR_HC ;
-        FORMAT_IDLIST
-    };
-
-#define MISC_IDLIST         \
-    IdList =                \
-    {                       \
-        RID_INFINITY ;      \
-        RID_PARTIAL ;       \
-        RID_NABLA ;         \
-        RID_EXISTS ;        \
-        RID_FORALL ;        \
-        RID_HBAR;           \
-        RID_LAMBDABAR ;     \
-        RID_RE ;            \
-        RID_IM ;            \
-        RID_WP ;            \
-        RID_LEFTARROW ;     \
-        RID_RIGHTARROW ;    \
-        RID_UPARROW ;       \
-        RID_DOWNARROW ;     \
-        RID_DOTSLOW ;       \
-        RID_DOTSAXIS ;      \
-        RID_DOTSVERT ;      \
-        RID_DOTSUP ;        \
-        RID_DOTSDOWN ;      \
-    };                      \
-    IdCount = { 19 ; };
-
-    ImageList RID_IL_MISC
-    {
-        Prefix = "mi";
-        MaskColor = IMAGE_STDBTN_COLOR ;
-        MISC_IDLIST
-    };
-    ImageList RID_ILH_MISC
-    {
-        Prefix = "mih";
-        MaskColor = IMAGE_STDBTN_COLOR_HC ;
-        MISC_IDLIST
-    };
-
-#define CATALOG_IDLIST                  \
-    IdList =                        \
-    {                               \
-        RID_UNBINOPS_CAT ;          \
-        RID_RELATIONS_CAT ;         \
-        RID_SETOPERATIONS_CAT ;     \
-        RID_FUNCTIONS_CAT ;         \
-        RID_OPERATORS_CAT ;         \
-        RID_ATTRIBUTES_CAT ;        \
-        RID_MISC_CAT ;              \
-        RID_BRACKETS_CAT ;          \
-        RID_FORMAT_CAT ;            \
-    };                              \
-    IdCount = { 9 ; };
-
-    ImageList RID_IL_CATALOG
-    {
-        Prefix = "im";
-        MaskColor = IMAGE_STDBTN_COLOR ;
-        CATALOG_IDLIST
-    };
-    ImageList RID_ILH_CATALOG
-    {
-        Prefix = "imh";
-        MaskColor = IMAGE_STDBTN_COLOR_HC ;
-        CATALOG_IDLIST
-    };
-
-
-
 String STR_CMDBOXWINDOW
 {
     CMDBOXWINDOW_TEXT
@@ -3503,9 +1711,9 @@ StringArray RID_PRINTUIOPTIONS
         < "Adjusts the formula to the page format used in the printout."; >;
         < "~Scaling"; >;
         < "Reduces or enlarges the size of the printed formula by a specified enlargement factor."; >;
-        < "Miscellaneous options"; >;
-        < "Ig~nore ~~ and ` at the end of the line"; >;
-        < "Specfies that these space wildcards will be removed if they are at the end of a line."; >;
+//        < "Miscellaneous options"; >;
+//        < "Ig~nore ~~ and ` at the end of the line"; >;
+//        < "Specfies that these space wildcards will be removed if they are at the end of a line."; >;
     };
 };
 
diff --git a/starmath/source/symbol.cxx b/starmath/source/symbol.cxx
index e248f9726629..52d0520ae61b 100644
--- a/starmath/source/symbol.cxx
+++ b/starmath/source/symbol.cxx
@@ -78,7 +78,7 @@ SmSym::SmSym(const SmSym& rSymbol)
 }
 
 
-SmSym::SmSym(const String& rName, const Font& rFont, sal_Unicode cChar,
+SmSym::SmSym(const String& rName, const Font& rFont, sal_UCS4 cChar,
              const String& rSet, BOOL bIsPredefined)
 {
     m_aName     = m_aExportName   = rName;
@@ -290,6 +290,28 @@ void SmSymbolManager::Load()
         DBG_ERROR( "no symbol set found" );
         m_bModified = false;
     }
+
+    // now add a %i... symbol to the 'iGreek' set for every symbol found in the 'Greek' set.
+    SmLocalizedSymbolData   aLocalizedData;
+    const String aGreekSymbolSetName( aLocalizedData.GetUiSymbolSetName( A2OU("Greek") ) );
+    const SymbolPtrVec_t    aGreekSymbols( GetSymbolSet( aGreekSymbolSetName ) );
+    String aSymbolSetName( (sal_Unicode) 'i' );
+    aSymbolSetName += aGreekSymbolSetName;
+    size_t nSymbols = aGreekSymbols.size();
+    for (size_t i = 0;  i < nSymbols;  ++i)
+    {
+        // make the new symbol a copy but with ITALIC_NORMAL, and add it to iGreek
+        const SmSym &rSym = *aGreekSymbols[i];
+        Font aFont( rSym.GetFace() );
+        DBG_ASSERT( aFont.GetItalic() == ITALIC_NONE, "expected Font with ITALIC_NONE, failed." );
+        aFont.SetItalic( ITALIC_NORMAL );
+        String aSymbolName( (sal_Unicode)'i' );
+        aSymbolName += rSym.GetName();
+        SmSym aSymbol( aSymbolName, aFont, rSym.GetCharacter(),
+                aSymbolSetName, TRUE /*bIsPredefined*/ );
+
+        AddOrReplaceSymbol( aSymbol );
+    }
 }
 
 void SmSymbolManager::Save()
@@ -314,10 +336,21 @@ void SmSymbolManager::Save()
         }
         DBG_ASSERT(pSym - pSymbols == nSaveSymbolCnt, "wrong number of symbols" );
 #endif
+
+        // prepare to skip symbols from iGreek on saving
+        SmLocalizedSymbolData   aLocalizedData;
+        String aSymbolSetName( (sal_Unicode) 'i' );
+        aSymbolSetName += aLocalizedData.GetUiSymbolSetName( A2OU("Greek") );
+
         SymbolPtrVec_t aTmp( GetSymbols() );
         std::vector< SmSym > aSymbols;
         for (size_t i = 0; i < aTmp.size(); ++i)
-            aSymbols.push_back( *aTmp[i] );
+        {
+            // skip symbols from iGreek set since those symbols always get added
+            // by computational means in SmSymbolManager::Load
+            if (aTmp[i]->GetSymbolSetName() != aSymbolSetName)
+                aSymbols.push_back( *aTmp[i] );
+        }
         rCfg.SetSymbols( aSymbols );
 #if 0
         delete [] pSymbols;
diff --git a/starmath/source/toolbox.cxx b/starmath/source/toolbox.cxx
index 2de6c97ed5ab..5bcf1448aca0 100644
--- a/starmath/source/toolbox.cxx
+++ b/starmath/source/toolbox.cxx
@@ -135,7 +135,7 @@ SmToolBoxWindow::SmToolBoxWindow(SfxBindings *pTmpBindings,
                                  SfxChildWindow *pChildWindow,
                                  Window *pParent) :
     SfxFloatingWindow(pTmpBindings, pChildWindow, pParent, SmResId(RID_TOOLBOXWINDOW)),
-    aToolBoxCat(this, SmResId(NUM_TBX_CATEGORIES + 1)),
+    aToolBoxCat(this, SmResId(TOOLBOX_CATALOG)),
     aToolBoxCat_Delim(this, SmResId( FL_TOOLBOX_CAT_DELIM ))
 {
     RTL_LOGFILE_CONTEXT( aLog, "starmath: SmToolBoxWindow::SmToolBoxWindow" );
@@ -143,14 +143,14 @@ SmToolBoxWindow::SmToolBoxWindow(SfxBindings *pTmpBindings,
     // allow for cursor travelling between toolbox and sub-categories
     SetStyle( GetStyle() | WB_DIALOGCONTROL );
 
-    nActiveCategoryRID = sal::static_int_cast< USHORT >(-1);
+    nActiveCategoryRID = USHRT_MAX;
 
     aToolBoxCat.SetClickHdl(LINK(this, SmToolBoxWindow, CategoryClickHdl));
 
     USHORT i;
-    for (i = 0;  i < NUM_TBX_CATEGORIES;  i++)
+    for (i = 0;  i < NUM_TBX_CATEGORIES;  ++i)
     {
-        ToolBox *pBox = new ToolBox(this, SmResId (i+1));
+        ToolBox *pBox = new ToolBox(this, SmResId( TOOLBOX_CAT_A + i ));
         vToolBoxCategories[i] = pBox;
         pBox->SetSelectHdl(LINK(this, SmToolBoxWindow, CmdSelectHdl));
     }
@@ -163,15 +163,12 @@ SmToolBoxWindow::SmToolBoxWindow(SfxBindings *pTmpBindings,
     }
 
     FreeResource();
-
-    ApplyImageLists( RID_UNBINOPS_CAT );
-    SetCategory( RID_UNBINOPS_CAT );
 }
 
 SmToolBoxWindow::~SmToolBoxWindow()
 {
     int i;
-    for (i = 0;  i < NUM_TBX_CATEGORIES;  i++)
+    for (i = 0;  i < NUM_TBX_CATEGORIES;  ++i)
     {
         ToolBox *pBox = vToolBoxCategories[i];
         delete pBox;
@@ -249,11 +246,11 @@ void SmToolBoxWindow::StateChanged( StateChangedType nStateChange )
     static BOOL bSetPosition = TRUE;
     if (STATE_CHANGE_INITSHOW == nStateChange)
     {
+        SetCategory( nActiveCategoryRID == USHRT_MAX ? RID_UNBINOPS_CAT : nActiveCategoryRID );
+
         // calculate initial position to be used after creation of the window...
         AdjustPosSize( bSetPosition );
         bSetPosition = FALSE;
-
-        SetCategory(RID_UNBINOPS_CAT);
     }
     //... otherwise the base class will remember the last position of the window
     SfxFloatingWindow::StateChanged( nStateChange );
@@ -263,7 +260,7 @@ void SmToolBoxWindow::StateChanged( StateChangedType nStateChange )
 void SmToolBoxWindow::AdjustPosSize( BOOL bSetPos )
 {
     Size aCatSize( aToolBoxCat.CalcWindowSizePixel( 2 ) );
-    Size aCmdSize( pToolBoxCmd->CalcWindowSizePixel( 5 ) );
+    Size aCmdSize( pToolBoxCmd->CalcWindowSizePixel( 4 /* see nLines in SetCategory*/ ) );
     DBG_ASSERT( aCatSize.Width() == aCmdSize.Width(), "width mismatch" );
 
     // catalog settings
@@ -271,14 +268,12 @@ void SmToolBoxWindow::AdjustPosSize( BOOL bSetPos )
     aToolBoxCat.SetSizePixel( aCatSize );
     // settings for catalog / category delimiter
     Point aP( aToolBoxCat_Delim.GetPosPixel() );
-    aP.X() += 5;
+    aP.X() = 0;
     aToolBoxCat_Delim.SetPosPixel( aP );
-    Size  aS( aCatSize.Width() - 10, 10 );
-    aToolBoxCat_Delim.SetSizePixel( aS );
+    aToolBoxCat_Delim.SetSizePixel( Size( aCatSize.Width(), aToolBoxCat_Delim.GetSizePixel().Height() ) );
     // category settings
-    aP.X() = 0;
     aP.Y() += aToolBoxCat_Delim.GetSizePixel().Height();
-    for (int i = 0;  i < NUM_TBX_CATEGORIES;  i++)
+    for (int i = 0;  i < NUM_TBX_CATEGORIES;  ++i)
     {
         vToolBoxCategories[i]->SetPosPixel( aP );
         vToolBoxCategories[i]->SetSizePixel( aCmdSize );
@@ -327,63 +322,60 @@ void SmToolBoxWindow::GetFocus()
 void SmToolBoxWindow::SetCategory(USHORT nCategoryRID)
 {
     if (nCategoryRID != nActiveCategoryRID)
-    {
         ApplyImageLists( nCategoryRID );
 
-        USHORT nLines;
-        // check for valid resource id
-        switch (nCategoryRID)
-        {
-            case RID_UNBINOPS_CAT :     nLines = 4; break;
-            case RID_RELATIONS_CAT:     nLines = 5; break;
-            case RID_SETOPERATIONS_CAT: nLines = 5; break;
-            case RID_FUNCTIONS_CAT:     nLines = 5; break;
-            case RID_OPERATORS_CAT:     nLines = 3; break;
-            case RID_ATTRIBUTES_CAT:    nLines = 5; break;
-            case RID_MISC_CAT:          nLines = 4; break;
-            case RID_BRACKETS_CAT:      nLines = 5; break;
-            case RID_FORMAT_CAT:        nLines = 3; break;
-            default:
-                // nothing to be done
-                return;
-        }
+    USHORT nLines;
+    // check for valid resource id
+    switch (nCategoryRID)
+    {
+        case RID_UNBINOPS_CAT :     nLines = 4; break;
+        case RID_RELATIONS_CAT:     nLines = 4; break;
+        case RID_SETOPERATIONS_CAT: nLines = 4; break;
+        case RID_FUNCTIONS_CAT:     nLines = 4; break;
+        case RID_OPERATORS_CAT:     nLines = 3; break;
+        case RID_ATTRIBUTES_CAT:    nLines = 4; break;
+        case RID_MISC_CAT:          nLines = 4; break;
+        case RID_BRACKETS_CAT:      nLines = 4; break;
+        case RID_FORMAT_CAT:        nLines = 3; break;
+        default:
+            // nothing to be done
+            return;
+    }
 
-        pToolBoxCmd->Hide();
+    pToolBoxCmd->Hide();
 
-        sal_Int16 nIdx = GetToolBoxCategoriesIndex( nCategoryRID );
-        DBG_ASSERT( nIdx >= 0, "unkown category" );
-        if (nIdx >= 0)
-            pToolBoxCmd = vToolBoxCategories[nIdx];
+    sal_Int16 nIdx = GetToolBoxCategoriesIndex( nCategoryRID );
+    DBG_ASSERT( nIdx >= 0, "unkown category" );
+    if (nIdx >= 0)
+        pToolBoxCmd = vToolBoxCategories[nIdx];
 
-        // calculate actual size of window to use
-        Size aCatSize( aToolBoxCat.CalcWindowSizePixel( 2 ) );
-        Size aCmdSize( pToolBoxCmd->CalcWindowSizePixel( nLines ) );
-        DBG_ASSERT( aCatSize.Width() == aCmdSize.Width(), "width mismatch" );
-        // main window settings
-        Size  aWndSize ( aCatSize.Width(), pToolBoxCmd->GetPosPixel().Y() + aCmdSize.Height() + 3);
-        SetOutputSizePixel( aWndSize );
+    // calculate actual size of window to use
+    Size aCatSize( aToolBoxCat.CalcWindowSizePixel( 2 ) );
+    Size aCmdSize( pToolBoxCmd->CalcWindowSizePixel( nLines ) );
+    DBG_ASSERT( aCatSize.Width() == aCmdSize.Width(), "width mismatch" );
+    // main window settings
+    Size  aWndSize ( aCatSize.Width(), pToolBoxCmd->GetPosPixel().Y() + aCmdSize.Height() + 3);
+    SetOutputSizePixel( aWndSize );
 
-        if (nActiveCategoryRID)
-            aToolBoxCat.CheckItem(nActiveCategoryRID, FALSE);
-        nActiveCategoryRID = nCategoryRID;
-        aToolBoxCat.CheckItem(nActiveCategoryRID, TRUE);
+    if (nActiveCategoryRID)
+        aToolBoxCat.CheckItem(nActiveCategoryRID, FALSE);
+    nActiveCategoryRID = nCategoryRID;
+    aToolBoxCat.CheckItem(nActiveCategoryRID, TRUE);
 
-        pToolBoxCmd->Show();
-    }
+    pToolBoxCmd->Show();
 }
 
 
-IMPL_LINK_INLINE_START( SmToolBoxWindow, CategoryClickHdl, ToolBox*, pToolBox)
+IMPL_LINK( SmToolBoxWindow, CategoryClickHdl, ToolBox*, pToolBox)
 {
     int nItemId = pToolBox->GetCurItemId();
     if (nItemId != 0)
         SetCategory( sal::static_int_cast< USHORT >(nItemId) );
     return 0;
 }
-IMPL_LINK_INLINE_END( SmToolBoxWindow, CategoryClickHdl, ToolBox*, pToolBox)
 
 
-IMPL_LINK_INLINE_START( SmToolBoxWindow, CmdSelectHdl, ToolBox*, pToolBox)
+IMPL_LINK( SmToolBoxWindow, CmdSelectHdl, ToolBox*, pToolBox)
 {
     SmViewShell *pViewSh = GetView();
     if (pViewSh)
@@ -392,7 +384,6 @@ IMPL_LINK_INLINE_START( SmToolBoxWindow, CmdSelectHdl, ToolBox*, pToolBox)
                 new SfxInt16Item(SID_INSERTCOMMAND, pToolBox->GetCurItemId()), 0L);
     return 0;
 }
-IMPL_LINK_INLINE_END( SmToolBoxWindow, CmdSelectHdl, ToolBox*, pToolBox)
 
 
 /**************************************************************************/
diff --git a/starmath/source/toolbox.hrc b/starmath/source/toolbox.hrc
index 687521d76a32..29adff303a3e 100644..100755
--- a/starmath/source/toolbox.hrc
+++ b/starmath/source/toolbox.hrc
@@ -28,7 +28,19 @@
 #ifndef _TOOLBOX_HRC_
 #define _TOOLBOX_HRC_
 
-#define FL_TOOLBOX_CAT_DELIM    21
+#define FL_TOOLBOX_CAT_DELIM    1
+#define TOOLBOX_CATALOG     10
+#define TOOLBOX_CAT_A       11
+#define TOOLBOX_CAT_B       12
+#define TOOLBOX_CAT_C       13
+#define TOOLBOX_CAT_D       14
+#define TOOLBOX_CAT_E       15
+#define TOOLBOX_CAT_F       16
+#define TOOLBOX_CAT_G       17
+#define TOOLBOX_CAT_H       18
+#define TOOLBOX_CAT_I       19
+
+#define NUM_TBX_CATEGORIES  (TOOLBOX_CAT_I - TOOLBOX_CAT_A + 1)
 
 #endif
 
diff --git a/starmath/source/toolbox.src b/starmath/source/toolbox.src
new file mode 100755
index 000000000000..ead1b32810c3
--- /dev/null
+++ b/starmath/source/toolbox.src
@@ -0,0 +1,1837 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2000, 2010 Oracle and/or its affiliates.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+
+#include <sfx2/sfx.hrc>
+#include <svx/globlmn.hrc>
+#include "starmath.hrc"
+#include "toolbox.hrc"
+
+#define IMAGE_STDBTN_COLOR Color { Red = 0xff00; Green = 0x0000; Blue = 0xff00; }
+#define IMAGE_STDBTN_COLOR_HC IMAGE_STDBTN_COLOR
+
+
+FloatingWindow RID_TOOLBOXWINDOW
+{
+    HelpId = HID_SMA_OPERATOR_WIN ;
+    Border = TRUE ;
+    Moveable = TRUE ;
+    Closeable = TRUE ;
+    Hide = TRUE ;
+    OutputSize = TRUE ;
+    SVLook = TRUE ;
+    Size = MAP_APPFONT ( 0 , 0 ) ;  // to be calculated programmatically
+    Text [ en-US ] = "Elements" ;
+
+    ToolBox TOOLBOX_CATALOG
+    {
+        // main menu of selection-window
+        HelpId = HID_SMA_SELECTION_TBX ;
+        Pos = MAP_APPFONT ( 0 , 0 ) ;
+        Size = MAP_APPFONT ( 65 , 38 ) ;
+        SVLook = TRUE ;
+        LineCount = 2 ;
+        ItemList =
+        {
+            ToolBoxItem
+            {
+                Identifier = RID_UNBINOPS_CAT ;
+                HelpId = HID_SMA_UNBINOPS_CAT ;
+                Text [ en-US ] = "Unary/Binary Operators" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_RELATIONS_CAT ;
+                HelpId = HID_SMA_RELATIONS_CAT ;
+                Text [ en-US ] = "Relations" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_SETOPERATIONS_CAT ;
+                HelpId = HID_SMA_SETOPERATIONS_CAT ;
+                Text [ en-US ] = "Set Operations" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_FUNCTIONS_CAT ;
+                HelpId = HID_SMA_FUNCTIONS_CAT ;
+                Text [ en-US ] = "Functions" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_OPERATORS_CAT ;
+                HelpId = HID_SMA_OPERATORS_CAT ;
+                Text [ en-US ] = "Operators" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_ATTRIBUTES_CAT ;
+                HelpId = HID_SMA_ATTRIBUTES_CAT ;
+                Text [ en-US ] = "Attributes" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_MISC_CAT ;
+                HelpId = HID_SMA_MISC_CAT ;
+                Text [ en-US ] = "Others";
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_SPACE ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_BRACKETS_CAT ;
+                HelpId = HID_SMA_BRACKETS_CAT ;
+                Text [ en-US ] = "Brackets" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_FORMAT_CAT ;
+                HelpId = HID_SMA_FORMAT_CAT ;
+                Text [ en-US ] = "Formats" ;
+            };
+        };
+    };
+
+    FixedLine FL_TOOLBOX_CAT_DELIM
+    {
+        Pos = MAP_APPFONT ( 0 , 44 ) ;
+        Size = MAP_APPFONT ( 65 , 8 ) ;
+    };
+
+    ToolBox TOOLBOX_CAT_A
+    {
+        // unary/binary operators
+        HelpId = HID_SMA_UNBINOPS_TBX ;
+        Pos = MAP_APPFONT ( 0 , 45 ) ;
+        Size = MAP_APPFONT ( 65 , 95 ) ;
+        SVLook = TRUE ;
+        Hide = TRUE ;
+        LineCount = 4 ;
+
+        ItemList =
+        {
+            ToolBoxItem
+            {
+                Identifier = RID_PLUSX ;
+                HelpId = HID_SMA_PLUSX ;
+                Text [ en-US ] = "+ Sign" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_MINUSX ;
+                HelpId = HID_SMA_MINUSX ;
+                Text [ en-US ] = "- Sign" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_PLUSMINUSX ;
+                HelpId = HID_SMA_PLUSMINUSX ;
+                Text [ en-US ] = "+- Sign" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_MINUSPLUSX ;
+                HelpId = HID_SMA_MINUSPLUSX ;
+                Text [ en-US ] = "-+ Sign" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_NEGX ;
+                HelpId = HID_SMA_NEGX ;
+                Text [ en-US ] = "Boolean NOT" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XPLUSY ;
+                HelpId = HID_SMA_XPLUSY ;
+                Text [ en-US ] = "Addition +" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XCDOTY ;
+                HelpId = HID_SMA_XCDOTY ;
+                Text [ en-US ] = "Multiplication (Dot )" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XTIMESY ;
+                HelpId = HID_SMA_XTIMESY ;
+                Text [ en-US ] = "Multiplication (x)" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XSYMTIMESY ;
+                HelpId = HID_SMA_XSYMTIMESY ;
+                Text [ en-US ] = "Multiplication (*)" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XANDY ;
+                HelpId = HID_SMA_XANDY ;
+                Text [ en-US ] = "Boolean AND" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XMINUSY ;
+                HelpId = HID_SMA_XMINUSY ;
+                Text [ en-US ] = "Subtraction -" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XOVERY ;
+                HelpId = HID_SMA_XOVERY ;
+                Text [ en-US ] = "Division (Fraction)" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XDIVY ;
+                HelpId = HID_SMA_XDIVY ;
+                Text [ en-US ] = "Division (÷)" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XSYMDIVIDEY ;
+                HelpId = HID_SMA_XSYMDIVIDEY ;
+                Text [ en-US ] = "Division (Slash)" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XORY ;
+                HelpId = HID_SMA_XORY ;
+                Text [ en-US ] = "Boolean OR" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XCIRCY ;
+                HelpId = HID_SMA_XCIRCY ;
+                Text [ en-US ] = "Concatenate";
+            };
+        };
+    };
+
+    ToolBox TOOLBOX_CAT_B
+    {
+        // relations
+        HelpId = HID_SMA_RELATIONS_TBX ;
+        Pos = MAP_APPFONT ( 0 , 45 ) ;
+        Size = MAP_APPFONT ( 65 , 95 ) ;
+        SVLook = TRUE ;
+        Hide = TRUE ;
+        LineCount = 5 ;
+        ItemList =
+        {
+            ToolBoxItem
+            {
+                Identifier = RID_XEQY ;
+                HelpId = HID_SMA_XEQY ;
+                Text [ en-US ] = "Is Equal" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XNEQY ;
+                HelpId = HID_SMA_XNEQY ;
+                Text [ en-US ] = "Is Not Equal" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XAPPROXY ;
+                HelpId = HID_SMA_XAPPROXY ;
+                Text [ en-US ] = "Is Approximately Equal" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XDIVIDESY ;
+                HelpId = HID_SMA_XDIVIDESY ;
+                Text [ en-US ] = "Divides";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XNDIVIDESY ;
+                HelpId = HID_SMA_XNDIVIDESY ;
+                Text [ en-US ] = "Does Not Divide";
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XLTY ;
+                HelpId = HID_SMA_XLTY ;
+                Text [ en-US ] = "Is Less Than" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XGTY ;
+                HelpId = HID_SMA_XGTY ;
+                Text [ en-US ] = "Is Greater Than" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XSIMEQY ;
+                HelpId = HID_SMA_XSIMEQY ;
+                /* ### ACHTUNG: Neuer Text in Resource? ist �hnlich oder gleich : ist �hnlich oder glech */
+                Text [ en-US ] = "Is Similar Or Equal" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XPARALLELY ;
+                HelpId = HID_SMA_XPARALLELY ;
+                Text [ en-US ] = "Is Parallel To" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XORTHOY ;
+                HelpId = HID_SMA_XORTHOY ;
+                Text [ en-US ] = "Is Orthogonal To" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XLESLANTY ;
+                HelpId = HID_SMA_XLESLANTY ;
+                Text [ en-US ] = "Is Less Than Or Equal To" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XGESLANTY ;
+                HelpId = HID_SMA_XGESLANTY ;
+                Text [ en-US ] = "Is Greater Than Or Equal To" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XSIMY ;
+                HelpId = HID_SMA_XSIMY ;
+                Text [ en-US ] = "Is Similar To" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XEQUIVY ;
+                HelpId = HID_SMA_XEQUIVY ;
+                Text [ en-US ] = "Is Congruent To" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_SPACE ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XLEY ;
+                HelpId = HID_SMA_XLEY ;
+                Text [ en-US ] = "Is Less Than Or Equal To" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XGEY ;
+                HelpId = HID_SMA_XGEY ;
+                Text [ en-US ] = "Is Greater Than Or Equal To" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XPROPY ;
+                HelpId = HID_SMA_XPROPY ;
+                Text [ en-US ] = "Is Proportional To" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XTOWARDY ;
+                HelpId = HID_SMA_XTOWARDY ;
+                Text [ en-US ] = "Toward" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_SPACE ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_DLARROW ;
+                HelpId = HID_SMA_DLARROW ;
+                Text [ en-US ] = "Double Arrow Left";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_DLRARROW ;
+                HelpId = HID_SMA_DLRARROW ;
+                Text [ en-US ] = "Double Arrow Left And Right";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_DRARROW ;
+                HelpId = HID_SMA_DRARROW ;
+                Text [ en-US ] = "Double Arrow Right";
+            };
+        };
+    };
+
+    ToolBox TOOLBOX_CAT_C
+    {
+        // set operations
+        HelpId = HID_SMA_SETOPERATIONS_TBX ;
+        Pos = MAP_APPFONT ( 0 , 45 ) ;
+        Size = MAP_APPFONT ( 65 , 95 ) ;
+        SVLook = TRUE ;
+        Hide = TRUE ;
+        LineCount = 5 ;
+        ItemList =
+        {
+            ToolBoxItem
+            {
+                Identifier = RID_XINY ;
+                HelpId = HID_SMA_XINY ;
+                Text [ en-US ] = "Is In" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XNOTINY ;
+                HelpId = HID_SMA_XNOTINY ;
+                Text [ en-US ] = "Is Not In" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XOWNSY ;
+                HelpId = HID_SMA_XOWNSY ;
+                Text [ en-US ] = "Owns" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_SPACE ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_EMPTYSET ;
+                HelpId = HID_SMA_EMPTYSET ;
+                Text [ en-US ] = "Empty Set";
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XINTERSECTIONY ;
+                HelpId = HID_SMA_XINTERSECTIONY ;
+                Text [ en-US ] = "Intersection" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XUNIONY ;
+                HelpId = HID_SMA_XUNIONY ;
+                Text [ en-US ] = "Union" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XSETMINUSY ;
+                HelpId = HID_SMA_XSETMINUSY ;
+                Text [ en-US ] = "Difference" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XSLASHY ;
+                HelpId = HID_SMA_XSLASHY ;
+                Text [ en-US ] = "Quotient Set" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_ALEPH ;
+                HelpId = HID_SMA_ALEPH ;
+                Text [ en-US ] = "Aleph";
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XSUBSETY ;
+                HelpId = HID_SMA_XSUBSETY ;
+                Text [ en-US ] = "Subset" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XSUBSETEQY ;
+                HelpId = HID_SMA_XSUBSETEQY ;
+                Text [ en-US ] = "Subset Or Equal To" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XSUPSETY ;
+                HelpId = HID_SMA_XSUPSETY ;
+                Text [ en-US ] = "Superset" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XSUPSETEQY ;
+                HelpId = HID_SMA_XSUPSETEQY ;
+                Text [ en-US ] = "Superset Or Equal To" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_SPACE ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XNSUBSETY ;
+                HelpId = HID_SMA_XNSUBSETY ;
+                Text [ en-US ] = "Not Subset" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XNSUBSETEQY ;
+                HelpId = HID_SMA_XNSUBSETEQY ;
+                Text [ en-US ] = "Not Subset Or Equal" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XNSUPSETY ;
+                HelpId = HID_SMA_XNSUPSETY ;
+                Text [ en-US ] = "Not Superset" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XNSUPSETEQY ;
+                HelpId = HID_SMA_XNSUPSETEQY ;
+                Text [ en-US ] = "Not Superset Or Equal" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_SPACE ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_SETN ;
+                HelpId = HID_SMA_SETN ;
+                Text [ en-US ] = "Natural Numbers Set";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_SETZ ;
+                HelpId = HID_SMA_SETZ ;
+                Text [ en-US ] = "Integers Set";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_SETQ ;
+                HelpId = HID_SMA_SETQ ;
+                Text [ en-US ] = "Set of Rational Numbers";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_SETR ;
+                HelpId = HID_SMA_SETR ;
+                Text [ en-US ] = "Real Numbers Set";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_SETC ;
+                HelpId = HID_SMA_SETC ;
+                Text [ en-US ] = "Complex Numbers Set";
+            };
+        };
+    };
+
+    ToolBox TOOLBOX_CAT_D
+    {
+        // functions
+        HelpId = HID_SMA_FUNCTIONS_TBX ;
+        Pos = MAP_APPFONT ( 0 , 45 ) ;
+        Size = MAP_APPFONT ( 65 , 95 ) ;
+        SVLook = TRUE ;
+        Hide = TRUE ;
+        LineCount = 5 ;
+        ItemList =
+        {
+            ToolBoxItem
+            {
+                Identifier = RID_EX ;
+                HelpId = HID_SMA_EX ;
+                Text [ en-US ] = "Exponential Function" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_LNX ;
+                HelpId = HID_SMA_LNX ;
+                Text [ en-US ] = "Natural Logarithm" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_EXPX ;
+                HelpId = HID_SMA_EXPX ;
+                Text [ en-US ] = "Exponential Function" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_LOGX ;
+                HelpId = HID_SMA_LOGX ;
+                Text [ en-US ] = "Logarithm" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_RSUPX ;
+                HelpId = HID_SMA_RSUPX ;
+                Text [ en-US ] = "Power";
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_SINX ;
+                HelpId = HID_SMA_SINX ;
+                Text [ en-US ] = "Sine" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_COSX ;
+                HelpId = HID_SMA_COSX ;
+                Text [ en-US ] = "Cosine" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_TANX ;
+                HelpId = HID_SMA_TANX ;
+                Text [ en-US ] = "Tangent" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_COTX ;
+                HelpId = HID_SMA_COTX ;
+                Text [ en-US ] = "Cotangent" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_SQRTX ;
+                HelpId = HID_SMA_SQRTX ;
+                Text [ en-US ] = "Square Root" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_ARCSINX ;
+                HelpId = HID_SMA_ARCSINX ;
+                Text [ en-US ] = "Arcsine" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_ARCCOSX ;
+                HelpId = HID_SMA_ARCCOSX ;
+                Text [ en-US ] = "Arccosine" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_ARCTANX ;
+                HelpId = HID_SMA_ARCTANX ;
+                Text [ en-US ] = "Arctangent" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_ARCCOTX ;
+                HelpId = HID_SMA_ARCCOTX ;
+                Text [ en-US ] = "Arccotangent" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_NROOTXY ;
+                HelpId = HID_SMA_NROOTXY ;
+                Text [ en-US ] = "N-th Root" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_SINHX ;
+                HelpId = HID_SMA_SINHX ;
+                Text [ en-US ] = "Hyperbolic Sine" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_COSHX ;
+                HelpId = HID_SMA_COSHX ;
+                Text [ en-US ] = "Hyperbolic Cosine" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_TANHX ;
+                HelpId = HID_SMA_TANHX ;
+                Text [ en-US ] = "Hyperbolic Tangent" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_COTHX ;
+                HelpId = HID_SMA_COTHX ;
+                Text [ en-US ] = "Hyperbolic Cotangent" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_ABSX ;
+                HelpId = HID_SMA_ABSX ;
+                Text [ en-US ] = "Absolute Value" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_ARSINHX ;
+                HelpId = HID_SMA_ARSINHX ;
+                Text [ en-US ] = "Area Hyperbolic Sine" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_ARCOSHX ;
+                HelpId = HID_SMA_ARCOSHX ;
+                Text [ en-US ] = "Area Hyperbolic Cosine" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_ARTANHX ;
+                HelpId = HID_SMA_ARTANHX ;
+                Text [ en-US ] = "Area Hyperbolic Tangent" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_ARCOTHX ;
+                HelpId = HID_SMA_ARCOTHX ;
+                Text [ en-US ] = "Area Hyperbolic Cotangent" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_FACTX ;
+                HelpId = HID_SMA_FACTX ;
+                Text [ en-US ] = "Factorial" ;
+            };
+        };
+    };
+
+    ToolBox TOOLBOX_CAT_E
+    {
+        // operators
+        HelpId = HID_SMA_OPERATORS_TBX ;
+        Pos = MAP_APPFONT ( 0 , 45 ) ;
+        Size = MAP_APPFONT ( 65 , 95 ) ;
+        SVLook = TRUE ;
+        Hide = TRUE ;
+        LineCount = 3 ;
+        ItemList =
+        {
+            ToolBoxItem
+            {
+                Identifier = RID_LIMX ;
+                HelpId = HID_SMA_LIMX ;
+                Text [ en-US ] = "Limes" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_SUMX ;
+                HelpId = HID_SMA_SUMX ;
+                Text [ en-US ] = "Sum" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_PRODX ;
+                HelpId = HID_SMA_PRODX ;
+                Text [ en-US ] = "Product" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_COPRODX ;
+                HelpId = HID_SMA_COPRODX ;
+                Text [ en-US ] = "Coproduct" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_FROMXTOY ;
+                HelpId = HID_SMA_FROMXTOY ;
+                Text [ en-US ] = "Upper And Lower Limit" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_INTX ;
+                HelpId = HID_SMA_INTX ;
+                Text [ en-US ] = "Integral" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_IINTX ;
+                HelpId = HID_SMA_IINTX ;
+                Text [ en-US ] = "Double Integral" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_IIINTX ;
+                HelpId = HID_SMA_IIINTX ;
+                Text [ en-US ] = "Triple Integral" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_SPACE ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_FROMX ;
+                HelpId = HID_SMA_FROMX ;
+                Text [ en-US ] = "Lower Limit" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_LINTX ;
+                HelpId = HID_SMA_LINTX ;
+                Text [ en-US ] = "Curve Integral" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_LLINTX ;
+                HelpId = HID_SMA_LLINTX ;
+                Text [ en-US ] = "Double Curve Integral" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_LLLINTX ;
+                HelpId = HID_SMA_LLLINTX ;
+                Text [ en-US ] = "Triple Curve Integral" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_SPACE ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_TOX ;
+                HelpId = HID_SMA_TOX ;
+                Text [ en-US ] = "Upper Limit" ;
+            };
+        };
+    };
+
+    ToolBox TOOLBOX_CAT_F
+    {
+        // attributs
+        HelpId = HID_SMA_ATTRIBUTES_TBX ;
+        Pos = MAP_APPFONT ( 0 , 45 ) ;
+        Size = MAP_APPFONT ( 65 , 95 ) ;
+        SVLook = TRUE ;
+        Hide = TRUE ;
+        LineCount = 5 ;
+        ItemList =
+        {
+            ToolBoxItem
+            {
+                Identifier = RID_ACUTEX ;
+                HelpId = HID_SMA_ACUTEX ;
+                Text [ en-US ] = "Acute Accent";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_GRAVEX ;
+                HelpId = HID_SMA_GRAVEX ;
+                Text [ en-US ] = "Grave Accent";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_CHECKX ;
+                HelpId = HID_SMA_CHECKX ;
+                Text [ en-US ] = "Reverse Circumflex" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_BREVEX ;
+                HelpId = HID_SMA_BREVEX ;
+                Text [ en-US ] = "Breve" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_CIRCLEX ;
+                HelpId = HID_SMA_CIRCLEX ;
+                Text [ en-US ] = "Circle" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_VECX ;
+                HelpId = HID_SMA_VECX ;
+                Text [ en-US ] = "Vector Arrow" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_TILDEX ;
+                HelpId = HID_SMA_TILDEX ;
+                Text [ en-US ] = "Tilde" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_HATX ;
+                HelpId = HID_SMA_HATX ;
+                Text [ en-US ] = "Circumflex" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_BARX ;
+                HelpId = HID_SMA_BARX ;
+                Text [ en-US ] = "Line Above" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_DOTX ;
+                HelpId = HID_SMA_DOTX ;
+                Text [ en-US ] = "Dot" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_WIDEVECX ;
+                HelpId = HID_SMA_WIDEVECX ;
+                Text [ en-US ] = "Large Vector Arrow";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_WIDETILDEX ;
+                HelpId = HID_SMA_WIDETILDEX ;
+                Text [ en-US ] = "Large Tilde";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_WIDEHATX ;
+                HelpId = HID_SMA_WIDEHATX ;
+                Text [ en-US ] = "Large Circumflex";
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_SPACE ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_DDOTX ;
+                HelpId = HID_SMA_DDOTX ;
+                Text [ en-US ] = "Double Dot" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_OVERLINEX ;
+                HelpId = HID_SMA_OVERLINEX ;
+                Text [ en-US ] = "Line Over" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_UNDERLINEX ;
+                HelpId = HID_SMA_UNDERLINEX ;
+                Text [ en-US ] = "Line Below" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_OVERSTRIKEX ;
+                HelpId = HID_SMA_OVERSTRIKEX ;
+                Text [ en-US ] = "Line Through" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_SPACE ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_DDDOTX ;
+                HelpId = HID_SMA_DDDOTX ;
+                Text [ en-US ] = "Triple Dot" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_PHANTOMX ;
+                HelpId = HID_SMA_PHANTOMX ;
+                Text [ en-US ] = "Transparent" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_BOLDX ;
+                HelpId = HID_SMA_BOLDX ;
+                Text [ en-US ] = "Bold Font" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_ITALX ;
+                HelpId = HID_SMA_ITALX ;
+                Text [ en-US ] = "Italic Font" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_SIZEXY ;
+                HelpId = HID_SMA_SIZEXY ;
+                Text [ en-US ] = "Resize" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_FONTXY ;
+                HelpId = HID_SMA_FONTXY ;
+                Text [ en-US ] = "Change Font" ;
+            };
+        };
+    };
+
+    ToolBox TOOLBOX_CAT_G
+    {
+        // parentheses
+        HelpId = HID_SMA_BRACKETS_TBX ;
+        Pos = MAP_APPFONT ( 0 , 45 ) ;
+        Size = MAP_APPFONT ( 65 , 95 ) ;
+        SVLook = TRUE ;
+        Hide = TRUE ;
+        LineCount = 5 ;
+        ItemList =
+        {
+            ToolBoxItem
+            {
+                Identifier = RID_LRPARENTX ;
+                HelpId = HID_SMA_LRPARENTX ;
+                Text [ en-US ] = "Round Brackets" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_LRBRACKETX ;
+                HelpId = HID_SMA_LRBRACKETX ;
+                Text [ en-US ] = "Square Brackets" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_LRDBRACKETX ;
+                HelpId = HID_SMA_LRDBRACKETX ;
+                Text [ en-US ] = "Double Square Brackets";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_LRLINEX ;
+                HelpId = HID_SMA_LRLINEX ;
+                Text [ en-US ] = "Single Lines" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_LRDLINEX ;
+                HelpId = HID_SMA_LRDLINEX ;
+                Text [ en-US ] = "Double Lines" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_LRBRACEX ;
+                HelpId = HID_SMA_LRBRACEX ;
+                Text [ en-US ] = "Braces" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_LRANGLEX ;
+                HelpId = HID_SMA_LRANGLEX ;
+                Text [ en-US ] = "Angle Brackets" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_LMRANGLEXY ;
+                HelpId = HID_SMA_LMRANGLEXY ;
+                Text [ en-US ] = "Operator Brackets";
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_SPACE ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_LRGROUPX ;
+                HelpId = HID_SMA_LRGROUPX ;
+                Text [ en-US ] = "Group Brackets" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_SLRPARENTX ;
+                HelpId = HID_SMA_SLRPARENTX ;
+                Text [ en-US ] = "Round Brackets (Scalable)" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_SLRBRACKETX ;
+                HelpId = HID_SMA_SLRBRACKETX ;
+                Text [ en-US ] = "Square Brackets (Scalable)" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_SLRDBRACKETX ;
+                HelpId = HID_SMA_SLRDBRACKETX ;
+                Text [ en-US ] = "Double Square Brackets (Scalable)";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_SLRLINEX ;
+                HelpId = HID_SMA_SLRLINEX ;
+                Text [ en-US ] = "Single Lines (Scalable)" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_SLRDLINEX ;
+                HelpId = HID_SMA_SLRDLINEX ;
+                Text [ en-US ] = "Double Lines (Scalable)" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_SLRBRACEX ;
+                HelpId = HID_SMA_SLRBRACEX ;
+                Text [ en-US ] = "Braces (Scalable)" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_SLRANGLEX ;
+                HelpId = HID_SMA_SLRANGLEX ;
+                Text [ en-US ] = "Angle Brackets (Scalable)" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_SLMRANGLEXY ;
+                HelpId = HID_SMA_SLMRANGLEXY ;
+                Text [ en-US ] = "Operator Brackets (Scalable)";
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XOVERBRACEY ;
+                HelpId = HID_SMA_XOVERBRACEY ;
+                Text [ en-US ] = "Braces Top (Scalable)";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_XUNDERBRACEY ;
+                HelpId = HID_SMA_XUNDERBRACEY ;
+                Text [ en-US ] = "Braces Bottom (Scalable)";
+            };
+        };
+    };
+
+    ToolBox TOOLBOX_CAT_H
+    {
+        // format
+        HelpId = HID_SMA_FORMAT_TBX ;
+        Pos = MAP_APPFONT ( 0 , 45 ) ;
+        Size = MAP_APPFONT ( 65 , 95 ) ;
+        SVLook = TRUE ;
+        Hide = TRUE ;
+        LineCount = 3 ;
+        ItemList =
+        {
+            ToolBoxItem
+            {
+                Identifier = RID_LSUPX ;
+                HelpId = HID_SMA_LSUPX ;
+                Text [ en-US ] = "Superscript Left" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_CSUPX ;
+                HelpId = HID_SMA_CSUPX ;
+                Text [ en-US ] = "Superscript Top";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_RSUPX ;
+                HelpId = HID_SMA_RSUPX ;
+                Text [ en-US ] = "Superscript Right" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_BINOMXY ;
+                HelpId = HID_SMA_BINOMXY ;
+                Text [ en-US ] = "Vertical Stack (2 Elements)" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_NEWLINE ;
+                HelpId = HID_SMA_NEWLINE ;
+                Text [ en-US ] = "New Line" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_LSUBX ;
+                HelpId = HID_SMA_LSUBX ;
+                Text [ en-US ] = "Subscript Left" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_CSUBX ;
+                HelpId = HID_SMA_CSUBX ;
+                Text [ en-US ] = "Subscript Bottom";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_RSUBX ;
+                HelpId = HID_SMA_RSUBX ;
+                Text [ en-US ] = "Subscript Right" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_STACK ;
+                HelpId = HID_SMA_STACK ;
+                Text [ en-US ] = "Vertical Stack" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_SBLANK ;
+                HelpId = HID_SMA_SBLANK ;
+                Text [ en-US ] = "Small Gap" ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_ALIGNLX ;
+                HelpId = HID_SMA_ALIGNLX ;
+                Text [ en-US ] = "Align Left" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_ALIGNCX ;
+                HelpId = HID_SMA_ALIGNCX ;
+                Text [ en-US ] = "Align Center" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_ALIGNRX ;
+                HelpId = HID_SMA_ALIGNRX ;
+                Text [ en-US ] = "Align Right" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_MATRIX ;
+                HelpId = HID_SMA_MATRIX ;
+                Text [ en-US ] = "Matrix Stack" ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_BLANK ;
+                HelpId = HID_SMA_BLANK ;
+                Text [ en-US ] = "Gap" ;
+            };
+        };
+    };
+
+    ToolBox TOOLBOX_CAT_I
+    {
+        // misc
+        HelpId = HID_SMA_FORMAT_TBX ;
+        Pos = MAP_APPFONT ( 0 , 45 ) ;
+        Size = MAP_APPFONT ( 65 , 95 ) ;
+        SVLook = TRUE ;
+        Hide = TRUE ;
+        LineCount = 4 ;
+        ItemList =
+        {
+            ToolBoxItem
+            {
+                Identifier = RID_INFINITY ;
+                HelpId = HID_SMA_INFINITY ;
+                Text [ en-US ] = "infinite";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_PARTIAL ;
+                HelpId = HID_SMA_PARTIAL ;
+                Text [ en-US ] = "Partial";
+            };
+            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_FORALL ;
+                HelpId = HID_SMA_FORALL ;
+                Text [ en-US ] = "For All";
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_HBAR ;
+                HelpId = HID_SMA_HBAR ;
+                Text [ en-US ] = "h Bar";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_LAMBDABAR ;
+                HelpId = HID_SMA_LAMBDABAR ;
+                Text [ en-US ] = "Lambda Bar";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_RE ;
+                HelpId = HID_SMA_RE ;
+                Text [ en-US ] = "Real Part";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_IM ;
+                HelpId = HID_SMA_IM ;
+                Text [ en-US ] = "Imaginary Part";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_WP ;
+                HelpId = HID_SMA_WP ;
+                Text [ en-US ] = "Weierstrass p";
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_LEFTARROW ;
+                HelpId = HID_SMA_LEFTARROW ;
+                Text [ en-US ] = "Left Arrow";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_RIGHTARROW ;
+                HelpId = HID_SMA_RIGHTARROW ;
+                Text [ en-US ] = "Right Arrow";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_UPARROW ;
+                HelpId = HID_SMA_UPARROW ;
+                Text [ en-US ] = "Up Arrow";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_DOWNARROW ;
+                HelpId = HID_SMA_DOWNARROW ;
+                Text [ en-US ] = "Down Arrow";
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_SPACE ;
+            };
+            ToolBoxItem
+            {
+                Type = TOOLBOXITEM_BREAK ;
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_DOTSLOW ;
+                HelpId = HID_SMA_DOTSLOW ;
+                Text [ en-US ] = "Dots At Bottom";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_DOTSAXIS ;
+                HelpId = HID_SMA_DOTSAXIS ;
+                Text [ en-US ] = "Dots In Middle";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_DOTSVERT ;
+                HelpId = HID_SMA_DOTSVERT ;
+                Text [ en-US ] = "Dots Vertically";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_DOTSUP ;
+                HelpId = HID_SMA_DOTSUP ;
+                Text [ en-US ] = "Dots To Top";
+            };
+            ToolBoxItem
+            {
+                Identifier = RID_DOTSDOWN ;
+                HelpId = HID_SMA_DOTSDOWN ;
+                Text [ en-US ] = "Dots to Bottom";
+            };
+        };
+    };
+};
+
+
+
+#define UNBINOPS_IDLIST         \
+    IdList =                \
+    {                       \
+        RID_PLUSX ;         \
+        RID_MINUSX ;        \
+        RID_PLUSMINUSX ;    \
+        RID_MINUSPLUSX ;    \
+        RID_XPLUSY ;        \
+        RID_XCDOTY ;        \
+        RID_XTIMESY ;       \
+        RID_XSYMTIMESY ;    \
+        RID_XMINUSY ;       \
+        RID_XOVERY ;        \
+        RID_XDIVY ;         \
+        RID_XSYMDIVIDEY ;   \
+        RID_NEGX ;          \
+        RID_XANDY ;         \
+        RID_XORY ;          \
+        RID_XCIRCY ;        \
+    };                      \
+    IdCount = { 16 ; };
+
+    ImageList RID_IL_UNBINOPS
+    {
+        Prefix = "un";
+        MaskColor = IMAGE_STDBTN_COLOR ;
+        UNBINOPS_IDLIST
+    };
+    ImageList RID_ILH_UNBINOPS
+    {
+        Prefix = "unh";
+        MaskColor = IMAGE_STDBTN_COLOR_HC ;
+        UNBINOPS_IDLIST
+    };
+
+#define RELATIONS_IDLIST         \
+    IdList =                \
+    {                       \
+        RID_XEQY ;          \
+        RID_XNEQY ;         \
+        RID_XEQUIVY ;       \
+        RID_XORTHOY ;       \
+        RID_XLTY ;          \
+        RID_XGTY ;          \
+        RID_XAPPROXY ;      \
+        RID_XPARALLELY ;    \
+        RID_XLESLANTY ;     \
+        RID_XGESLANTY ;     \
+        RID_XSIMEQY ;       \
+        RID_XPROPY ;        \
+        RID_XLEY ;          \
+        RID_XGEY ;          \
+        RID_XSIMY ;         \
+        RID_XTOWARDY ;      \
+        RID_XDIVIDESY ;     \
+        RID_XNDIVIDESY;     \
+        RID_DLARROW ;       \
+        RID_DLRARROW ;      \
+        RID_DRARROW ;       \
+    };                      \
+    IdCount ={ 21 ; };
+
+    ImageList RID_IL_RELATIONS
+    {
+        Prefix = "bi";
+        MaskColor = IMAGE_STDBTN_COLOR ;
+        RELATIONS_IDLIST
+    };
+    ImageList RID_ILH_RELATIONS
+    {
+        Prefix = "bih";
+        MaskColor = IMAGE_STDBTN_COLOR_HC ;
+        RELATIONS_IDLIST
+    };
+
+#define SETOPERATIONS_IDLIST             \
+    IdList =                    \
+    {                           \
+        RID_XINY ;              \
+        RID_XNOTINY ;           \
+        RID_XOWNSY ;            \
+        RID_XINTERSECTIONY ;    \
+        RID_XUNIONY ;           \
+        RID_XSETMINUSY ;        \
+        RID_XSLASHY ;           \
+        RID_XSUBSETY ;          \
+        RID_XSUBSETEQY ;        \
+        RID_XSUPSETY ;          \
+        RID_XSUPSETEQY ;        \
+        RID_XNSUBSETY ;         \
+        RID_XNSUBSETEQY ;       \
+        RID_XNSUPSETY ;         \
+        RID_XNSUPSETEQY ;       \
+        RID_EMPTYSET ;          \
+        RID_ALEPH ;             \
+        RID_SETN ;              \
+        RID_SETZ ;              \
+        RID_SETQ ;              \
+        RID_SETR ;              \
+        RID_SETC ;              \
+    };                          \
+    IdCount = { 22 ; };
+
+    ImageList RID_IL_SETOPERATIONS
+    {
+        Prefix = "op";
+        MaskColor = IMAGE_STDBTN_COLOR ;
+        SETOPERATIONS_IDLIST
+    };
+    ImageList RID_ILH_SETOPERATIONS
+    {
+        Prefix = "oph";
+        MaskColor = IMAGE_STDBTN_COLOR_HC ;
+        SETOPERATIONS_IDLIST
+    };
+
+#define FUNCTIONS_IDLIST         \
+    IdList =                \
+    {                       \
+        RID_ABSX ;          \
+        RID_FACTX ;         \
+        RID_SQRTX ;         \
+        RID_NROOTXY ;       \
+        RID_EX ;            \
+        RID_LNX ;           \
+        RID_EXPX ;          \
+        RID_LOGX ;          \
+        RID_SINX ;          \
+        RID_COSX ;          \
+        RID_TANX ;          \
+        RID_COTX ;          \
+        RID_SINHX ;         \
+        RID_COSHX ;         \
+        RID_TANHX ;         \
+        RID_COTHX ;         \
+        RID_ARCSINX ;       \
+        RID_ARCCOSX ;       \
+        RID_ARCTANX ;       \
+        RID_ARCCOTX ;       \
+        RID_ARSINHX ;       \
+        RID_ARCOSHX ;       \
+        RID_ARTANHX ;       \
+        RID_ARCOTHX ;       \
+        RID_RSUPX ;         \
+    };                      \
+    IdCount = { 25 ; };
+
+    ImageList RID_IL_FUNCTIONS
+    {
+        Prefix = "fu";
+        MaskColor = IMAGE_STDBTN_COLOR ;
+        FUNCTIONS_IDLIST
+    };
+    ImageList RID_ILH_FUNCTIONS
+    {
+        Prefix = "fuh";
+        MaskColor = IMAGE_STDBTN_COLOR_HC ;
+        FUNCTIONS_IDLIST
+    };
+
+#define OPERATORS_IDLIST         \
+    IdList =                \
+    {                       \
+        RID_LIMX ;          \
+        RID_SUMX ;          \
+        RID_PRODX ;         \
+        RID_COPRODX ;       \
+        RID_INTX ;          \
+        RID_IINTX ;         \
+        RID_IIINTX ;        \
+        RID_LINTX ;         \
+        RID_LLINTX ;        \
+        RID_LLLINTX ;       \
+        RID_FROMXTOY ;      \
+        RID_FROMX ;         \
+        RID_TOX ;           \
+    };                      \
+    IdCount = { 13 ; };
+
+    ImageList RID_IL_OPERATORS
+    {
+        Prefix = "fo";
+        MaskColor = IMAGE_STDBTN_COLOR ;
+        OPERATORS_IDLIST
+    };
+    ImageList RID_ILH_OPERATORS
+    {
+        Prefix = "foh";
+        MaskColor = IMAGE_STDBTN_COLOR_HC ;
+        OPERATORS_IDLIST
+    };
+
+#define ATTRIBUTES_IDLIST             \
+    IdList =                    \
+    {                           \
+        RID_ACUTEX ;            \
+        RID_GRAVEX ;            \
+        RID_CHECKX ;            \
+        RID_BREVEX ;            \
+        RID_BARX ;              \
+        RID_VECX ;              \
+        RID_HATX ;              \
+        RID_TILDEX ;            \
+        RID_CIRCLEX ;           \
+        RID_DOTX ;              \
+        RID_DDOTX ;             \
+        RID_DDDOTX ;            \
+        RID_OVERLINEX ;         \
+        RID_UNDERLINEX ;        \
+        RID_OVERSTRIKEX ;       \
+        RID_PHANTOMX ;          \
+        RID_BOLDX ;             \
+        RID_ITALX ;             \
+        RID_SIZEXY ;            \
+        RID_FONTXY ;            \
+        RID_WIDEHATX ;          \
+        RID_WIDETILDEX ;        \
+        RID_WIDEVECX ;          \
+    };                          \
+    IdCount = { 23 ; };
+
+    ImageList RID_IL_ATTRIBUTES
+    {
+        Prefix = "at";
+        MaskColor = IMAGE_STDBTN_COLOR ;
+        ATTRIBUTES_IDLIST
+    };
+    ImageList RID_ILH_ATTRIBUTES
+    {
+        Prefix = "ath";
+        MaskColor = IMAGE_STDBTN_COLOR_HC ;
+        ATTRIBUTES_IDLIST
+    };
+
+#define BRACKETS_IDLIST             \
+    IdList =                    \
+    {                           \
+        RID_LRPARENTX ;         \
+        RID_LRBRACKETX ;        \
+        RID_LRANGLEX ;          \
+        RID_LRBRACEX ;          \
+        RID_LRLINEX ;           \
+        RID_LRDLINEX ;          \
+        RID_LMRANGLEXY ;        \
+        RID_LRGROUPX ;          \
+        RID_SLRPARENTX ;        \
+        RID_SLRBRACKETX ;       \
+        RID_SLRANGLEX ;         \
+        RID_SLRBRACEX ;         \
+        RID_SLRLINEX ;          \
+        RID_SLRDLINEX ;         \
+        RID_SLMRANGLEXY ;       \
+        RID_LRDBRACKETX ;       \
+        RID_SLRDBRACKETX ;      \
+        RID_XOVERBRACEY ;       \
+        RID_XUNDERBRACEY ;      \
+    };                          \
+    IdCount = { 19 ; };
+
+    ImageList RID_IL_BRACKETS
+    {
+        Prefix = "al";
+        MaskColor = IMAGE_STDBTN_COLOR ;
+        BRACKETS_IDLIST
+    };
+    ImageList RID_ILH_BRACKETS
+    {
+        Prefix = "alh";
+        MaskColor = IMAGE_STDBTN_COLOR_HC ;
+        BRACKETS_IDLIST
+    };
+
+#define FORMAT_IDLIST         \
+    IdList =                \
+    {                       \
+        RID_NEWLINE ;       \
+        RID_SBLANK ;        \
+        RID_BLANK ;         \
+        RID_BINOMXY ;       \
+        RID_STACK ;         \
+        RID_MATRIX ;        \
+        RID_ALIGNLX ;       \
+        RID_ALIGNCX ;       \
+        RID_ALIGNRX ;       \
+        RID_RSUBX ;         \
+        RID_RSUPX ;         \
+        RID_LSUBX ;         \
+        RID_LSUPX ;         \
+        RID_CSUBX ;         \
+        RID_CSUPX ;         \
+    };                      \
+    IdCount = { 15 ; };
+
+    ImageList RID_IL_FORMAT
+    {
+        Prefix = "co";
+        MaskColor = IMAGE_STDBTN_COLOR ;
+        FORMAT_IDLIST
+    };
+    ImageList RID_ILH_FORMAT
+    {
+        Prefix = "coh";
+        MaskColor = IMAGE_STDBTN_COLOR_HC ;
+        FORMAT_IDLIST
+    };
+
+#define MISC_IDLIST         \
+    IdList =                \
+    {                       \
+        RID_INFINITY ;      \
+        RID_PARTIAL ;       \
+        RID_NABLA ;         \
+        RID_EXISTS ;        \
+        RID_FORALL ;        \
+        RID_HBAR;           \
+        RID_LAMBDABAR ;     \
+        RID_RE ;            \
+        RID_IM ;            \
+        RID_WP ;            \
+        RID_LEFTARROW ;     \
+        RID_RIGHTARROW ;    \
+        RID_UPARROW ;       \
+        RID_DOWNARROW ;     \
+        RID_DOTSLOW ;       \
+        RID_DOTSAXIS ;      \
+        RID_DOTSVERT ;      \
+        RID_DOTSUP ;        \
+        RID_DOTSDOWN ;      \
+    };                      \
+    IdCount = { 19 ; };
+
+    ImageList RID_IL_MISC
+    {
+        Prefix = "mi";
+        MaskColor = IMAGE_STDBTN_COLOR ;
+        MISC_IDLIST
+    };
+    ImageList RID_ILH_MISC
+    {
+        Prefix = "mih";
+        MaskColor = IMAGE_STDBTN_COLOR_HC ;
+        MISC_IDLIST
+    };
+
+#define CATALOG_IDLIST                  \
+    IdList =                        \
+    {                               \
+        RID_UNBINOPS_CAT ;          \
+        RID_RELATIONS_CAT ;         \
+        RID_SETOPERATIONS_CAT ;     \
+        RID_FUNCTIONS_CAT ;         \
+        RID_OPERATORS_CAT ;         \
+        RID_ATTRIBUTES_CAT ;        \
+        RID_MISC_CAT ;              \
+        RID_BRACKETS_CAT ;          \
+        RID_FORMAT_CAT ;            \
+    };                              \
+    IdCount = { 9 ; };
+
+    ImageList RID_IL_CATALOG
+    {
+        Prefix = "im";
+        MaskColor = IMAGE_STDBTN_COLOR ;
+        CATALOG_IDLIST
+    };
+    ImageList RID_ILH_CATALOG
+    {
+        Prefix = "imh";
+        MaskColor = IMAGE_STDBTN_COLOR_HC ;
+        CATALOG_IDLIST
+    };
+
+
+
diff --git a/starmath/source/types.cxx b/starmath/source/types.cxx
index a861db5a0c79..e63d46c79e9b 100644
--- a/starmath/source/types.cxx
+++ b/starmath/source/types.cxx
@@ -38,7 +38,7 @@ sal_Unicode ConvertMathPrivateUseAreaToUnicode( sal_Unicode cChar )
     if (IsInPrivateUseArea( cChar ))
     {
         DBG_ASSERT( 0, "Error: private use area characters should no longer be in use!" );
-        cRes = (sal_Unicode) '&'; // just some character that should easily be notice as odd in the context
+        cRes = (sal_Unicode) '@'; // just some character that should easily be notice as odd in the context
     }
     return cRes;
 }
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index 013831f6e44e..cd3e4b714469 100644..100755
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -81,8 +81,8 @@ using namespace ::com::sun::star::script;
 SmPrintUIOptions::SmPrintUIOptions()
 {
     ResStringArray      aLocalizedStrings( SmResId( RID_PRINTUIOPTIONS ) );
-    DBG_ASSERT( aLocalizedStrings.Count() >= 18, "resource incomplete" );
-    if( aLocalizedStrings.Count() < 18 ) // bad resource ?
+    DBG_ASSERT( aLocalizedStrings.Count() >= 15, "resource incomplete" );
+    if( aLocalizedStrings.Count() < 15 ) // bad resource ?
         return;
 
     SmModule *pp = SM_MOD();
@@ -203,6 +203,7 @@ enum SmModelPropertyHandles
     HANDLE_RELATIVE_FONT_HEIGHT_OPERATORS,
     HANDLE_RELATIVE_FONT_HEIGHT_LIMITS,
     HANDLE_IS_TEXT_MODE,
+    HANDLE_GREEK_CHAR_STYLE,
     HANDLE_ALIGNMENT,
     HANDLE_RELATIVE_SPACING,
     HANDLE_RELATIVE_LINE_SPACING,
@@ -273,6 +274,7 @@ PropertySetInfo * lcl_createModelPropertyInfo ()
         { RTL_CONSTASCII_STRINGPARAM( "Formula"                           ),    HANDLE_FORMULA                             ,        &::getCppuType((const OUString*)0),     PROPERTY_NONE, 0},
         { RTL_CONSTASCII_STRINGPARAM( "IsScaleAllBrackets"              ), HANDLE_IS_SCALE_ALL_BRACKETS              ,      &::getBooleanCppuType(),    PROPERTY_NONE, 0},
         { RTL_CONSTASCII_STRINGPARAM( "IsTextMode"                       ), HANDLE_IS_TEXT_MODE                       ,         &::getBooleanCppuType(),    PROPERTY_NONE, 0},
+        { RTL_CONSTASCII_STRINGPARAM( "GreekCharStyle" ),                   HANDLE_GREEK_CHAR_STYLE,    &::getCppuType((const sal_Int16*)0),    PROPERTY_NONE, 0},
         { RTL_CONSTASCII_STRINGPARAM( "LeftMargin"                        ), HANDLE_LEFT_MARGIN                        ,        &::getCppuType((const sal_Int16*)0),    PROPERTY_NONE, DIS_LEFTSPACE                 },
         { RTL_CONSTASCII_STRINGPARAM( "PrinterName"                    ), HANDLE_PRINTER_NAME                        ,      &::getCppuType((const OUString*)0),     PROPERTY_NONE, 0                  },
         { RTL_CONSTASCII_STRINGPARAM( "PrinterSetup"                       ), HANDLE_PRINTER_SETUP                       ,      &::getCppuType((const Sequence < sal_Int8 >*)0),    PROPERTY_NONE, 0                  },
@@ -593,6 +595,16 @@ void SmModel::_setPropertyValues(const PropertyMapEntry** ppEntries, const Any*
             }
             break;
 
+            case HANDLE_GREEK_CHAR_STYLE                    :
+            {
+                sal_Int16 nVal = 0;
+                *pValues >>= nVal;
+                if (nVal < 0 || nVal > 2)
+                    throw IllegalArgumentException();
+                aFormat.SetGreekCharStyle( nVal );
+            }
+            break;
+
             case HANDLE_ALIGNMENT                          :
             {
                 // SmHorAlign uses the same values as HorizontalAlignment
@@ -824,6 +836,10 @@ void SmModel::_getPropertyValues( const PropertyMapEntry **ppEntries, Any *pValu
             }
             break;
 
+            case HANDLE_GREEK_CHAR_STYLE                    :
+                *pValue <<= (sal_Int16)aFormat.GetGreekCharStyle();
+            break;
+
             case HANDLE_ALIGNMENT                          :
                 // SmHorAlign uses the same values as HorizontalAlignment
                 *pValue <<= (sal_Int16)aFormat.GetHorAlign();
diff --git a/starmath/source/utility.cxx b/starmath/source/utility.cxx
index 0000bf5cf766..ff62e1631265 100644
--- a/starmath/source/utility.cxx
+++ b/starmath/source/utility.cxx
@@ -45,6 +45,8 @@
 #include "smdll.hxx"
 
 
+////////////////////////////////////////////////////////////
+
 // return pointer to active SmViewShell, if this is not possible
 // return 0 instead.
 //!! Since this method is based on the current focus it is somewhat
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 886d409931b2..20c235408013 100644..100755
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -749,7 +749,7 @@ SFX_IMPL_INTERFACE(SmViewShell, SfxViewShell, SmResId(0))
 }
 
 
-SFX_IMPL_VIEWFACTORY(SmViewShell, SmResId(RID_VIEWNAME))
+SFX_IMPL_NAMED_VIEWFACTORY(SmViewShell, "Default")
 {
     SFX_VIEW_REGISTRATION(SmDocShell);
 }
@@ -1545,14 +1545,13 @@ void SmViewShell::Execute(SfxRequest& rReq)
         case SID_INSERTTEXT:
         {
             const SfxStringItem& rItem =
-                (const SfxStringItem&)rReq.GetArgs()->Get(SID_INSERTTEXT);
-
+                    (const SfxStringItem&)rReq.GetArgs()->Get(SID_INSERTTEXT);
             if (pWin)
                 pWin->InsertText(rItem.GetValue());
             break;
         }
 
-        case SID_INSERT_FORMULA:
+        case SID_IMPORT_FORMULA:
         {
             delete pImpl->pRequest;
             pImpl->pRequest = new SfxRequest( rReq );
diff --git a/starmath/uiconfig/smath/menubar/menubar.xml b/starmath/uiconfig/smath/menubar/menubar.xml
index 63bf72c0cf62..7c82d733fa70 100644..100755
--- a/starmath/uiconfig/smath/menubar/menubar.xml
+++ b/starmath/uiconfig/smath/menubar/menubar.xml
@@ -83,7 +83,7 @@
   <menu:menu menu:id=".uno:ToolsMenu">
     <menu:menupopup>
       <menu:menuitem menu:id=".uno:SymbolCatalogue"/>
-      <menu:menuitem menu:id=".uno:InsertFormula"/>
+      <menu:menuitem menu:id=".uno:ImportFormula"/>
       <menu:menuseparator/>
       <menu:menu menu:id=".uno:MacrosMenu">
         <menu:menupopup>
diff --git a/starmath/util/makefile.mk b/starmath/util/makefile.mk
index 1ba52411d721..08f673452f3c 100644
--- a/starmath/util/makefile.mk
+++ b/starmath/util/makefile.mk
@@ -112,3 +112,17 @@ SHL1RES=	$(RCTARGET)
 
 .INCLUDE :  target.mk
 
+
+ALLTAR : $(MISC)/sm.component $(MISC)/smd.component
+
+$(MISC)/sm.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        sm.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt sm.component
+
+$(MISC)/smd.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \
+        smd.component
+    $(XSLTPROC) --nonet --stringparam uri \
+        '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL2TARGETN:f)' -o $@ \
+        $(SOLARENV)/bin/createcomponent.xslt smd.component
diff --git a/starmath/util/sm.component b/starmath/util/sm.component
new file mode 100644
index 000000000000..8047662e2915
--- /dev/null
+++ b/starmath/util/sm.component
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.Math.FormulaDocument">
+    <service name="com.sun.star.formula.FormulaProperties"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Math.XMLContentExporter">
+    <service name="com.sun.star.xml.XMLExportFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Math.XMLExporter">
+    <service name="com.sun.star.xml.XMLExportFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Math.XMLImporter">
+    <service name="com.sun.star.xml.XMLImportFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Math.XMLMetaExporter">
+    <service name="com.sun.star.xml.XMLExportFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Math.XMLOasisMetaExporter">
+    <service name="com.sun.star.xml.XMLExportFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Math.XMLOasisMetaImporter">
+    <service name="com.sun.star.xml.XMLImportFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Math.XMLOasisSettingsExporter">
+    <service name="com.sun.star.xml.XMLExportFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Math.XMLOasisSettingsImporter">
+    <service name="com.sun.star.xml.XMLImportFilter"/>
+  </implementation>
+  <implementation name="com.sun.star.comp.Math.XMLSettingsExporter">
+    <service name="com.sun.star.xml.XMLExportFilter"/>
+  </implementation>
+</component>
diff --git a/starmath/util/smd.component b/starmath/util/smd.component
new file mode 100644
index 000000000000..9f566864482e
--- /dev/null
+++ b/starmath/util/smd.component
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--**********************************************************************
+*
+* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+*
+* Copyright 2000, 2010 Oracle and/or its affiliates.
+*
+* OpenOffice.org - a multi-platform office productivity suite
+*
+* This file is part of OpenOffice.org.
+*
+* OpenOffice.org is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License version 3
+* only, as published by the Free Software Foundation.
+*
+* OpenOffice.org is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License version 3 for more details
+* (a copy is included in the LICENSE file that accompanied this code).
+*
+* You should have received a copy of the GNU Lesser General Public License
+* version 3 along with OpenOffice.org.  If not, see
+* <http://www.openoffice.org/license.html>
+* for a copy of the LGPLv3 License.
+*
+**********************************************************************-->
+
+<component loader="com.sun.star.loader.SharedLibrary"
+    xmlns="http://openoffice.org/2010/uno-components">
+  <implementation name="com.sun.star.comp.math.FormatDetector">
+    <service name="com.sun.star.frame.ExtendedTypeDetection"/>
+  </implementation>
+</component>