diff options
author | Thomas Lange <tl@openoffice.org> | 2001-07-17 07:28:21 +0000 |
---|---|---|
committer | Thomas Lange <tl@openoffice.org> | 2001-07-17 07:28:21 +0000 |
commit | aa73f452d6c0446d6d22f9b0de6f88efb817b589 (patch) | |
tree | b2ebfd7588b1cfc55f2d340e4bd8cc6827a23ca3 /starmath/inc | |
parent | 6949d6e8284f972b48859a83ff07d01b8fc22a25 (diff) |
#89759# StarMath font => StarSymbol font
Diffstat (limited to 'starmath/inc')
-rw-r--r-- | starmath/inc/dialog.hxx | 93 | ||||
-rw-r--r-- | starmath/inc/format.hxx | 9 | ||||
-rw-r--r-- | starmath/inc/types.hxx | 288 |
3 files changed, 184 insertions, 206 deletions
diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx index f1f8224a9a7a..4a02c2caf52e 100644 --- a/starmath/inc/dialog.hxx +++ b/starmath/inc/dialog.hxx @@ -2,9 +2,9 @@ * * $RCSfile: dialog.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: fme $ $Date: 2001-06-15 06:41:18 $ + * last change: $Author: tl $ $Date: 2001-07-17 08:28:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -79,6 +79,9 @@ #ifndef _SV_COMBOBOX_HXX //autogen #include <vcl/combobox.hxx> #endif +#ifndef _SVX_CHARMAP_HXX +#include <svx/charmap.hxx> +#endif #ifndef _SVX_OPTGENRL_HXX //autogen #include <svx/optgenrl.hxx> #endif @@ -447,38 +450,6 @@ public: void SelectSymbol(USHORT nSymbolNo); }; -/**************************************************************************/ - -class SmShowCharset : public Control -{ - Link aSelectHdlLink; - Link aDblClickHdlLink; - USHORT nLen; - USHORT nRows, nColumns; - xub_Unicode aChar; - - virtual void Paint(const Rectangle&); - virtual void MouseButtonDown( const MouseEvent& rMEvt ); - virtual void KeyInput(const KeyEvent& rKEvt); - -public: - SmShowCharset(Window *pParent, const ResId& rResId); - - void SetSelectHdl(const Link& rLink) - { - aSelectHdlLink = rLink; - } - - void SetDblClickHdl(const Link& rLink) - { - aDblClickHdlLink = rLink; - } - - void SetFont(const Font &rFont); - void SelectChar(xub_Unicode aChar); - xub_Unicode GetSelectChar() const { return aChar; } -}; - //////////////////////////////////////////////////////////////////////////////// class SmShowChar : public Control @@ -499,31 +470,33 @@ public: class SmSymDefineDialog : public ModalDialog { - FixedText aOldSymbolText; - ComboBox aOldSymbols; - FixedText aOldSymbolSetText; - ComboBox aOldSymbolSets; - SmShowCharset aCharsetDisplay; - FixedText aSymbolText; - ComboBox aSymbols; - FixedText aSymbolSetText; - ComboBox aSymbolSets; - FixedText aFontText; - ListBox aFonts; - FixedText aStyleText; - FontStyleBox aStyles; - FixedText aOldSymbolName; - SmShowChar aOldSymbolDisplay; - FixedText aOldSymbolSetName; - FixedText aSymbolName; - SmShowChar aSymbolDisplay; - FixedText aSymbolSetName; - OKButton aOkBtn; - CancelButton aCancelBtn; - PushButton aAddBtn; - PushButton aChangeBtn; - PushButton aDeleteBtn; - FixedImage aRightArrow; + FixedText aOldSymbolText; + ComboBox aOldSymbols; + FixedText aOldSymbolSetText; + ComboBox aOldSymbolSets; + SvxShowCharSet aCharsetDisplay; + FixedText aSymbolText; + ComboBox aSymbols; + FixedText aSymbolSetText; + ComboBox aSymbolSets; + FixedText aFontText; + ListBox aFonts; + FixedText aFontsSubsetFT; + ListBox aFontsSubsetLB; + FixedText aStyleText; + FontStyleBox aStyles; + FixedText aOldSymbolName; + SmShowChar aOldSymbolDisplay; + FixedText aOldSymbolSetName; + FixedText aSymbolName; + SmShowChar aSymbolDisplay; + FixedText aSymbolSetName; + OKButton aOkBtn; + CancelButton aCancelBtn; + PushButton aAddBtn; + PushButton aChangeBtn; + PushButton aDeleteBtn; + FixedImage aRightArrow; SmSymSetManager aSymSetMgrCopy, &rSymSetMgr; @@ -536,7 +509,7 @@ class SmSymDefineDialog : public ModalDialog DECL_LINK(ModifyHdl, ComboBox *); DECL_LINK(FontChangeHdl, ListBox *); DECL_LINK(StyleChangeHdl, ComboBox *); - DECL_LINK(CharSelectHdl, SmShowCharset *); + DECL_LINK( CharHighlightHdl, Control* pControl ); DECL_LINK(AddClickHdl, Button *); DECL_LINK(ChangeClickHdl, Button *); DECL_LINK(DeleteClickHdl, Button *); diff --git a/starmath/inc/format.hxx b/starmath/inc/format.hxx index 8ff06a603692..d9dec1a9aa16 100644 --- a/starmath/inc/format.hxx +++ b/starmath/inc/format.hxx @@ -2,9 +2,9 @@ * * $RCSfile: format.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: tl $ $Date: 2001-05-02 16:58:48 $ + * last change: $Author: tl $ $Date: 2001-07-17 08:28:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -72,6 +72,9 @@ #ifndef UTILITY_HXX #include "utility.hxx" #endif +#ifndef TYPES_HXX +#include <types.hxx> +#endif #define SM_FMT_VERSION_51 ((BYTE) 0x01) @@ -84,7 +87,7 @@ #endif #define FNTNAME_HELV "Helvetica" #define FNTNAME_COUR "Courier" -#define FNTNAME_MATH "StarMath" +#define FNTNAME_MATH FONTNAME_MATH // symbolic names used as array indices diff --git a/starmath/inc/types.hxx b/starmath/inc/types.hxx index c7aac531e8bf..de08a3907a9a 100644 --- a/starmath/inc/types.hxx +++ b/starmath/inc/types.hxx @@ -2,9 +2,9 @@ * * $RCSfile: types.hxx,v $ * - * $Revision: 1.1.1.1 $ + * $Revision: 1.2 $ * - * last change: $Author: hr $ $Date: 2000-09-18 16:57:25 $ + * last change: $Author: tl $ $Date: 2001-07-17 08:28:19 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -62,153 +62,155 @@ #define TYPES_HXX -//////////////////////////////////////// -// enum definitions for characters from the 'StarMath' font +#define FONTNAME_MATH "StarSymbol" + +///////////////////////////////////////////////////////////////// +// enum definitions for characters from the 'StarSymbol' font // (some chars have more than one alias!) //! Note: not listed here does not(!) mean "not used" //! (see %alpha ... %gamma for example) // enum MathSymbol { - MS_FACT = (xub_Unicode) 0xF021, - MS_INFINITY = (xub_Unicode) 0xF027, - MS_SLASH = (xub_Unicode) 0xF02F, - - MS_NDIVIDES = (xub_Unicode) 0xF030, - MS_DRARROW = (xub_Unicode) 0xF031, - MS_DLARROW = (xub_Unicode) 0xF032, - MS_DLRARROW = (xub_Unicode) 0xF033, - MS_UNDERBRACE = (xub_Unicode) 0xF034, - MS_OVERBRACE = (xub_Unicode) 0xF035, - MS_CIRC = (xub_Unicode) 0xF036, - MS_ASSIGN = (xub_Unicode) 0xF03D, - MS_ERROR = (xub_Unicode) 0xF03F, - - MS_NEQ = (xub_Unicode) 0xF040, - MS_PLUS = (xub_Unicode) 0xF041, - MS_MINUS = (xub_Unicode) 0xF042, - MS_MULTIPLY = (xub_Unicode) 0xF043, - MS_TIMES = (xub_Unicode) 0xF044, - MS_CDOT = (xub_Unicode) 0xF045, - MS_DIV = (xub_Unicode) 0xF046, - MS_PLUSMINUS = (xub_Unicode) 0xF047, - MS_MINUSPLUS = (xub_Unicode) 0xF048, - MS_OPLUS = (xub_Unicode) 0xF049, - MS_OMINUS = (xub_Unicode) 0xF04A, - MS_OTIMES = (xub_Unicode) 0xF04B, - MS_ODIVIDE = (xub_Unicode) 0xF04C, - MS_ODOT = (xub_Unicode) 0xF04D, - MS_UNION = (xub_Unicode) 0xF04E, - MS_INTERSECT = (xub_Unicode) 0xF04F, - - MS_LT = (xub_Unicode) 0xF050, - MS_GT = (xub_Unicode) 0xF051, - MS_LE = (xub_Unicode) 0xF052, - MS_GE = (xub_Unicode) 0xF053, - MS_LESLANT = (xub_Unicode) 0xF054, - MS_GESLANT = (xub_Unicode) 0xF055, - MS_LL = (xub_Unicode) 0xF056, - MS_GG = (xub_Unicode) 0xF057, - MS_SIM = (xub_Unicode) 0xF058, - MS_SIMEQ = (xub_Unicode) 0xF059, - MS_APPROX = (xub_Unicode) 0xF05A, - MS_DEF = (xub_Unicode) 0xF05B, - MS_EQUIV = (xub_Unicode) 0xF05C, - MS_PROP = (xub_Unicode) 0xF05D, - MS_PARTIAL = (xub_Unicode) 0xF05E, - MS_SUBSET = (xub_Unicode) 0xF05F, - - MS_SUPSET = (xub_Unicode) 0xF060, - MS_SUBSETEQ = (xub_Unicode) 0xF061, - MS_SUPSETEQ = (xub_Unicode) 0xF062, - MS_NSUBSET = (xub_Unicode) 0xF063, - MS_NSUPSET = (xub_Unicode) 0xF064, - MS_NSUBSETEQ = (xub_Unicode) 0xF065, - MS_NSUPSETEQ = (xub_Unicode) 0xF066, - MS_IN = (xub_Unicode) 0xF067, - MS_NOTIN = (xub_Unicode) 0xF068, - MS_EXISTS = (xub_Unicode) 0xF06A, - MS_BACKEPSILON = (xub_Unicode) 0xF06B, - MS_ALEPH = (xub_Unicode) 0xF06C, - MS_IM = (xub_Unicode) 0xF06D, - MS_RE = (xub_Unicode) 0xF06E, - MS_WP = (xub_Unicode) 0xF06F, - - MS_LINE = (xub_Unicode) 0xF073, - MS_DLINE = (xub_Unicode) 0xF074, - MS_ORTHO = (xub_Unicode) 0xF075, - MS_DOTSLOW = (xub_Unicode) 0xF076, - MS_DOTSAXIS = (xub_Unicode) 0xF077, - MS_DOTSVERT = (xub_Unicode) 0xF078, - MS_DOTSUP = (xub_Unicode) 0xF079, - MS_DOTSDOWN = (xub_Unicode) 0xF07A, - MS_TRANSR = (xub_Unicode) 0xF07B, - MS_TRANSL = (xub_Unicode) 0xF07C, - MS_RIGHTARROW = (xub_Unicode) 0xF07D, - MS_BACKSLASH = (xub_Unicode) 0xF07E, - MS_NEG = (xub_Unicode) 0xF07F, - - MS_INT = (xub_Unicode) 0xF080, - MS_IINT = (xub_Unicode) 0xF081, - MS_IIINT = (xub_Unicode) 0xF082, - MS_LINT = (xub_Unicode) 0xF083, - MS_LLINT = (xub_Unicode) 0xF084, - MS_LLLINT = (xub_Unicode) 0xF085, - MS_SQRT = (xub_Unicode) 0xF087, - MS_SQRT2 = (xub_Unicode) 0xF089, - MS_COPROD = (xub_Unicode) 0xF08A, - MS_PROD = (xub_Unicode) 0xF08B, - MS_SUM = (xub_Unicode) 0xF08C, - MS_NABLA = (xub_Unicode) 0xF08D, - MS_FORALL = (xub_Unicode) 0xF08E, - - MS_HAT = (xub_Unicode) 0xF090, - MS_CHECK = (xub_Unicode) 0xF091, - MS_BREVE = (xub_Unicode) 0xF092, - MS_ACUTE = (xub_Unicode) 0xF093, - MS_GRAVE = (xub_Unicode) 0xF094, - MS_TILDE = (xub_Unicode) 0xF095, - MS_BAR = (xub_Unicode) 0xF096, - MS_VEC = (xub_Unicode) 0xF097, - MS_DOT = (xub_Unicode) 0xF098, - MS_DDOT = (xub_Unicode) 0xF099, - MS_DDDOT = (xub_Unicode) 0xF09A, - MS_CIRCLE = (xub_Unicode) 0xF09B, - MS_AND = (xub_Unicode) 0xF09C, - MS_OR = (xub_Unicode) 0xF09D, - MS_NI = (xub_Unicode) 0xF09E, - MS_EMPTYSET = (xub_Unicode) 0xF09F, - - MS_LBRACE = (xub_Unicode) 0xF0A0, - MS_RBRACE = (xub_Unicode) 0xF0A1, - MS_LPARENT = (xub_Unicode) 0xF0A2, - MS_RPARENT = (xub_Unicode) 0xF0A3, - MS_LANGLE = (xub_Unicode) 0xF0A4, - MS_RANGLE = (xub_Unicode) 0xF0A5, - MS_LBRACKET = (xub_Unicode) 0xF0A6, - MS_RBRACKET = (xub_Unicode) 0xF0A7, - - MS_LDBRACKET = (xub_Unicode) 0xF0B2, - MS_RDBRACKET = (xub_Unicode) 0xF0B3, - MS_PLACE = (xub_Unicode) 0xF0BF, - - MS_LCEIL = (xub_Unicode) 0xF0C0, - MS_LFLOOR = (xub_Unicode) 0xF0C1, - MS_RCEIL = (xub_Unicode) 0xF0C2, - MS_RFLOOR = (xub_Unicode) 0xF0C3, - MS_SQRT2_X = (xub_Unicode) 0xF0C5, - - MS_TOP = (xub_Unicode) 0xF0F5, - MS_HBAR = (xub_Unicode) 0xF0F6, - MS_LAMBDABAR = (xub_Unicode) 0xF0F7, - MS_LEFTARROW = (xub_Unicode) 0xF0F8, - MS_UPARROW = (xub_Unicode) 0xF0F9, - MS_DOWNARROW = (xub_Unicode) 0xF0FA, - MS_SETN = (xub_Unicode) 0xF0FB, - MS_SETZ = (xub_Unicode) 0xF0FC, - MS_SETQ = (xub_Unicode) 0xF0FD, - MS_SETR = (xub_Unicode) 0xF0FE, - MS_SETC = (xub_Unicode) 0xF0FF + MS_FACT = (xub_Unicode) 0x0021, + MS_INFINITY = (xub_Unicode) 0x221E, + MS_SLASH = (xub_Unicode) 0x002F, + + MS_NDIVIDES = (xub_Unicode) 0x2224, + MS_DRARROW = (xub_Unicode) 0x21D2, + MS_DLARROW = (xub_Unicode) 0x21D0, + MS_DLRARROW = (xub_Unicode) 0x21D4, + MS_UNDERBRACE = (xub_Unicode) 0xE081, + MS_OVERBRACE = (xub_Unicode) 0xE082, + MS_CIRC = (xub_Unicode) 0x00B0, + MS_ASSIGN = (xub_Unicode) 0x003D, + MS_ERROR = (xub_Unicode) 0x00BF, + + MS_NEQ = (xub_Unicode) 0x2260, + MS_PLUS = (xub_Unicode) 0xE083, + MS_MINUS = (xub_Unicode) 0x2212, + MS_MULTIPLY = (xub_Unicode) 0x2217, + MS_TIMES = (xub_Unicode) 0x00D7, + MS_CDOT = (xub_Unicode) 0x2219, + MS_DIV = (xub_Unicode) 0x00F7, + MS_PLUSMINUS = (xub_Unicode) 0x00B1, + MS_MINUSPLUS = (xub_Unicode) 0x2213, + MS_OPLUS = (xub_Unicode) 0x2295, + MS_OMINUS = (xub_Unicode) 0x2296, + MS_OTIMES = (xub_Unicode) 0x2297, + MS_ODIVIDE = (xub_Unicode) 0x2298, + MS_ODOT = (xub_Unicode) 0x2299, + MS_UNION = (xub_Unicode) 0x222A, + MS_INTERSECT = (xub_Unicode) 0x2229, + + MS_LT = (xub_Unicode) 0xE084, + MS_GT = (xub_Unicode) 0xE085, + MS_LE = (xub_Unicode) 0x2264, + MS_GE = (xub_Unicode) 0x2265, + MS_LESLANT = (xub_Unicode) 0xE086, + MS_GESLANT = (xub_Unicode) 0xE087, + MS_LL = (xub_Unicode) 0x226A, + MS_GG = (xub_Unicode) 0x226B, + MS_SIM = (xub_Unicode) 0x007E, + MS_SIMEQ = (xub_Unicode) 0x2243, + MS_APPROX = (xub_Unicode) 0x2248, + MS_DEF = (xub_Unicode) 0x225D, + MS_EQUIV = (xub_Unicode) 0x2261, + MS_PROP = (xub_Unicode) 0x221D, + MS_PARTIAL = (xub_Unicode) 0x2202, + MS_SUBSET = (xub_Unicode) 0x2282, + + MS_SUPSET = (xub_Unicode) 0x2283, + MS_SUBSETEQ = (xub_Unicode) 0x2286, + MS_SUPSETEQ = (xub_Unicode) 0x2287, + MS_NSUBSET = (xub_Unicode) 0x2284, + MS_NSUPSET = (xub_Unicode) 0x2285, + MS_NSUBSETEQ = (xub_Unicode) 0x2288, + MS_NSUPSETEQ = (xub_Unicode) 0x2289, + MS_IN = (xub_Unicode) 0x2208, + MS_NOTIN = (xub_Unicode) 0x2209, + MS_EXISTS = (xub_Unicode) 0x2203, + MS_BACKEPSILON = (xub_Unicode) 0x220D, + MS_ALEPH = (xub_Unicode) 0x2135, + MS_IM = (xub_Unicode) 0x2111, + MS_RE = (xub_Unicode) 0x211C, + MS_WP = (xub_Unicode) 0x2118, + + MS_LINE = (xub_Unicode) 0x2223, + MS_DLINE = (xub_Unicode) 0x2225, + MS_ORTHO = (xub_Unicode) 0x22A5, + MS_DOTSLOW = (xub_Unicode) 0xE08B, + MS_DOTSAXIS = (xub_Unicode) 0x22EF, + MS_DOTSVERT = (xub_Unicode) 0x22EE, + MS_DOTSUP = (xub_Unicode) 0x22F0, + MS_DOTSDOWN = (xub_Unicode) 0x22F1, + MS_TRANSR = (xub_Unicode) 0x22B6, + MS_TRANSL = (xub_Unicode) 0x22B7, + MS_RIGHTARROW = (xub_Unicode) 0xE08C, + MS_BACKSLASH = (xub_Unicode) 0x2216, + MS_NEG = (xub_Unicode) 0x00AC, + + MS_INT = (xub_Unicode) 0x222B, + MS_IINT = (xub_Unicode) 0x222C, + MS_IIINT = (xub_Unicode) 0x222D, + MS_LINT = (xub_Unicode) 0x222E, + MS_LLINT = (xub_Unicode) 0x222F, + MS_LLLINT = (xub_Unicode) 0x2230, + MS_SQRT = (xub_Unicode) 0xE08D, + MS_SQRT2 = (xub_Unicode) 0xE08F, + MS_COPROD = (xub_Unicode) 0x2210, + MS_PROD = (xub_Unicode) 0x220F, + MS_SUM = (xub_Unicode) 0x2211, + MS_NABLA = (xub_Unicode) 0x2207, + MS_FORALL = (xub_Unicode) 0x2200, + + MS_HAT = (xub_Unicode) 0xE091, + MS_CHECK = (xub_Unicode) 0xE092, + MS_BREVE = (xub_Unicode) 0xE093, + MS_ACUTE = (xub_Unicode) 0xE094, + MS_GRAVE = (xub_Unicode) 0xE095, + MS_TILDE = (xub_Unicode) 0xE096, + MS_BAR = (xub_Unicode) 0xE097, + MS_VEC = (xub_Unicode) 0xE098, + MS_DOT = (xub_Unicode) 0xE099, + MS_DDOT = (xub_Unicode) 0xE09A, + MS_DDDOT = (xub_Unicode) 0xE09B, + MS_CIRCLE = (xub_Unicode) 0xE09C, + MS_AND = (xub_Unicode) 0x2227, + MS_OR = (xub_Unicode) 0x2228, + MS_NI = (xub_Unicode) 0x220B, + MS_EMPTYSET = (xub_Unicode) 0x2205, + + MS_LBRACE = (xub_Unicode) 0x007B, + MS_RBRACE = (xub_Unicode) 0x007D, + MS_LPARENT = (xub_Unicode) 0xE09E, + MS_RPARENT = (xub_Unicode) 0xE09F, + MS_LANGLE = (xub_Unicode) 0x2329, + MS_RANGLE = (xub_Unicode) 0x232A, + MS_LBRACKET = (xub_Unicode) 0x005B, + MS_RBRACKET = (xub_Unicode) 0x005D, + + MS_LDBRACKET = (xub_Unicode) 0xE0A2, + MS_RDBRACKET = (xub_Unicode) 0xE0A3, + MS_PLACE = (xub_Unicode) 0xE0AA, + + MS_LCEIL = (xub_Unicode) 0x2308, + MS_LFLOOR = (xub_Unicode) 0x230A, + MS_RCEIL = (xub_Unicode) 0x2309, + MS_RFLOOR = (xub_Unicode) 0x230B, + MS_SQRT2_X = (xub_Unicode) 0xE0AB, + + MS_TOP = (xub_Unicode) 0xE0D9, + MS_HBAR = (xub_Unicode) 0x210F, + MS_LAMBDABAR = (xub_Unicode) 0xE0DA, + MS_LEFTARROW = (xub_Unicode) 0xE0DB, + MS_UPARROW = (xub_Unicode) 0xE0DC, + MS_DOWNARROW = (xub_Unicode) 0xE0DD, + MS_SETN = (xub_Unicode) 0x2115, + MS_SETZ = (xub_Unicode) 0x2124, + MS_SETQ = (xub_Unicode) 0x211A, + MS_SETR = (xub_Unicode) 0x211D, + MS_SETC = (xub_Unicode) 0x2102 }; |