Attachment #84119 for issue #118191

View | Details | Raw Unified | Return to issue 118191
Collapse All | Expand All

Lines 422-428 Link Here

(-)a/main/helpcontent2/source/text/smath/01/03090600.xhp (-1 / +2 lines)
422	</tablerow>	422	</tablerow>
423	</table>	423	</table>
424		424
425	<paragraph xml-lang="en-US" id="par_id3149626" role="paragraph" l10n="U" oldref="48"> Use the <emph>color</emph> command to change the color of your formula. Type <emph>color</emph>, then type the color name (the available colors are white, black, cyan, magenta, red, blue, green and yellow), then the formula, character or character sequence. The input <emph>color green size 20 a</emph> results in a green letter "a" with a font size of 20.</paragraph>	425	<paragraph xml-lang="en-US" id="par_id3149626" role="paragraph" l10n="U" oldref="48"> Use the <emph>color</emph> command to change the color of your formula. Type <emph>color</emph>, then type the color name, then the formula, character or character sequence. The input <emph>color green size 20 a</emph> results in a green letter "a" with a font size of 20.</paragraph>
		426	<paragraph xml-lang="en-US" id="par_id3149627" role="paragraph">Available color names are 16 HTML color names (white, silver, gray, white, maroon, red, purple, fuchsia, green, lime, olive, yellow, navy, blue, teal and aqua) and the names cyan and magenta. Cyan is rendered as aqua, magenta is rendered as fuchsia.</paragraph>
426	<paragraph xml-lang="en-US" id="par_id3146071" role="paragraph" l10n="U" oldref="51">The <emph>nbold</emph> and <emph>nitalic</emph> commands remove the bold or italic default fonts of formula components. For example, remove italics from the x in the formula 5 x + 3=28 by typing <emph>nitalic</emph> before the x as in <emph>5 nitalic x + 3=28</emph>.</paragraph>	427	<paragraph xml-lang="en-US" id="par_id3146071" role="paragraph" l10n="U" oldref="51">The <emph>nbold</emph> and <emph>nitalic</emph> commands remove the bold or italic default fonts of formula components. For example, remove italics from the x in the formula 5 x + 3=28 by typing <emph>nitalic</emph> before the x as in <emph>5 nitalic x + 3=28</emph>.</paragraph>
427	<paragraph xml-lang="en-US" id="par_id3150612" role="note" l10n="U" oldref="46">The <link href="text/smath/01/03091300.xhp" name="attributes">attributes</link> "acute", "bar", "breve", "check", "circle", "dot", "ddot", "dddot", "grave", "hat", "tilde" and "vec" have fixed sizes. Their width or length cannot be adjusted when positioned over a long symbol.</paragraph>	428	<paragraph xml-lang="en-US" id="par_id3150612" role="note" l10n="U" oldref="46">The <link href="text/smath/01/03091300.xhp" name="attributes">attributes</link> "acute", "bar", "breve", "check", "circle", "dot", "ddot", "dddot", "grave", "hat", "tilde" and "vec" have fixed sizes. Their width or length cannot be adjusted when positioned over a long symbol.</paragraph>
428	<paragraph xml-lang="en-US" id="par_id3155621" role="paragraph" l10n="U" oldref="52">For size changes you can use <emph>size n</emph>,<emph> +n</emph>,<emph> -n</emph>,<emph> n</emph> and<emph> /n </emph>, where <emph>n</emph> is a placeholder. This method is useful when the base size of the formula is subject to change. The commands <emph>size +n</emph> and <emph>size -n</emph> change point size, and <emph>size n</emph> and <emph>size /n</emph> change the size by a percentage. For example, the command <emph>size *1.17</emph> increases the size of a character by exactly 17%.</paragraph>	429	<paragraph xml-lang="en-US" id="par_id3155621" role="paragraph" l10n="U" oldref="52">For size changes you can use <emph>size n</emph>,<emph> +n</emph>,<emph> -n</emph>,<emph> n</emph> and<emph> /n </emph>, where <emph>n</emph> is a placeholder. This method is useful when the base size of the formula is subject to change. The commands <emph>size +n</emph> and <emph>size -n</emph> change point size, and <emph>size n</emph> and <emph>size /n</emph> change the size by a percentage. For example, the command <emph>size *1.17</emph> increases the size of a character by exactly 17%.</paragraph>

Lines 150-156 Link Here

(-)a/main/helpcontent2/source/text/smath/01/03091506.xhp (-1 / +1 lines)
150	<tablecell colspan="" rowspan="">	150	<tablecell colspan="" rowspan="">
151	<bookmark xml-lang="en-US" branch="index" id="bm_id3161843"><bookmark_value>formulas;in color</bookmark_value><bookmark_value>colors;in formulas</bookmark_value>	151	<bookmark xml-lang="en-US" branch="index" id="bm_id3161843"><bookmark_value>formulas;in color</bookmark_value><bookmark_value>colors;in formulas</bookmark_value>
152	</bookmark>	152	</bookmark>
153	<paragraph role="tablecontent" id="par_id3161843" xml-lang="en-US" l10n="U" oldref="349">The <emph>color</emph> command changes the character color; first enter the <emph>color</emph> command directly in the <emph>Commands</emph> window. Then enter the color name (black, white, cyan, magenta, red, blue, green, or yellow). Then enter the characters to be changed.</paragraph>	153	<paragraph role="tablecontent" id="par_id3161843" xml-lang="en-US" l10n="U" oldref="349">The <emph>color</emph> command changes the character color; first enter the <emph>color</emph> command directly in the <emph>Commands</emph> window. Then enter the color name (black, silver, gray, white, maroon, red, purple, fuchsia, green, lime, olive, yellow, navy, blue, teal, aqua, cyan, magenta). Then enter the characters to be changed.</paragraph>
154	</tablecell>	154	</tablecell>
155	</tablerow>	155	</tablerow>
156	<tablerow>	156	<tablerow>

Lines 95-101 enum SmTokenType Link Here

(-)a/main/starmath/inc/parse.hxx (-1 / +3 lines)
95	TSINH, TCOSH, TTANH, TCOTH, TASIN,	95	TSINH, TCOSH, TTANH, TCOTH, TASIN,
96	TACOS, TATAN, TLN, TLOG, TUOPER,	96	TACOS, TATAN, TLN, TLOG, TUOPER,
97	TBOPER, TBLACK, TWHITE, TRED, TGREEN,	97	TBOPER, TBLACK, TWHITE, TRED, TGREEN,
98	TBLUE, TCYAN, TMAGENTA, TYELLOW, TFIXED,	98	TBLUE, TCYAN, TMAGENTA, TYELLOW, TSILVER,
		99	TGRAY, TMAROON, TPURPLE, TLIME, TOLIVE,
		100	TNAVY, TTEAL, TAQUA, TFUCHSIA, TFIXED,
99	TSANS, TSERIF, TPOINT, TASINH, TACOSH,	101	TSANS, TSERIF, TPOINT, TASINH, TACOSH,
100	TATANH, TACOTH, TACOT, TEXP, TCDOT,	102	TATANH, TACOTH, TACOT, TEXP, TCDOT,
101	TODOT, TLESLANT, TGESLANT, TNSUBSET, TNSUPSET,	103	TODOT, TLESLANT, TGESLANT, TNSUBSET, TNSUPSET,




        case TYELLOW:
            AddAttribute(XML_NAMESPACE_MATH, XML_COLOR, XML_YELLOW);
            break;
        case TSILVER:
            AddAttribute(XML_NAMESPACE_MATH, XML_COLOR, XML_SILVER);
            break;
        case TGRAY:
            AddAttribute(XML_NAMESPACE_MATH, XML_COLOR, XML_GRAY);
            break;
        case TMAROON:
            AddAttribute(XML_NAMESPACE_MATH, XML_COLOR, XML_MAROON);
            break;
        case TOLIVE:
            AddAttribute(XML_NAMESPACE_MATH, XML_COLOR, XML_OLIVE);
            break;
        case TLIME:
            AddAttribute(XML_NAMESPACE_MATH, XML_COLOR, XML_LIME);
            break;
        case TAQUA:
            AddAttribute(XML_NAMESPACE_MATH, XML_COLOR, XML_AQUA);
            break;
        case TTEAL:
            AddAttribute(XML_NAMESPACE_MATH, XML_COLOR, XML_TEAL);
            break;
        case TNAVY:
            AddAttribute(XML_NAMESPACE_MATH, XML_COLOR, XML_NAVY);
            break;
        case TFUCHSIA:
            AddAttribute(XML_NAMESPACE_MATH, XML_COLOR, XML_FUCHSIA);
            break;
        case TPURPLE:
            AddAttribute(XML_NAMESPACE_MATH, XML_COLOR, XML_PURPLE);
            break;
        case TSIZE:
            {
                const SmFontNode *pFontNode = static_cast<const SmFontNode *>(pNode);

Lines 724-729 void SmXMLContext_Helper::RetrieveAttrs(const uno::Reference< Link Here

(-)a/main/starmath/source/mathmlimport.cxx (-3 / +17 lines)
724	case XML_TOK_COLOR:	724	case XML_TOK_COLOR:
725	sColor = sValue;	725	sColor = sValue;
726	break;	726	break;
		727	case XML_TOK_MATHCOLOR:
		728	sColor = sValue;
		729	break;
727	default:	730	default:
728	break;	731	break;
729	}	732	}
Lines 966-971 void SmXMLStyleContext_Impl::StartElement(const uno::Reference< Link Here
966	case XML_TOK_COLOR:	969	case XML_TOK_COLOR:
967	sColor = sValue;	970	sColor = sValue;
968	break;	971	break;
		972	case XML_TOK_MATHCOLOR:
		973	sColor = sValue;
		974	break;
969	default:	975	default:
970	break;	976	break;
971	}	977	}
Lines 2093-2098 static __FAR_DATA SvXMLTokenMapEntry aPresLayoutAttrTokenMap[] = Link Here
2093	{ XML_NAMESPACE_MATH, XML_FONTSIZE, XML_TOK_FONTSIZE },	2099	{ XML_NAMESPACE_MATH, XML_FONTSIZE, XML_TOK_FONTSIZE },
2094	{ XML_NAMESPACE_MATH, XML_FONTFAMILY, XML_TOK_FONTFAMILY },	2100	{ XML_NAMESPACE_MATH, XML_FONTFAMILY, XML_TOK_FONTFAMILY },
2095	{ XML_NAMESPACE_MATH, XML_COLOR, XML_TOK_COLOR },	2101	{ XML_NAMESPACE_MATH, XML_COLOR, XML_TOK_COLOR },
		2102	{ XML_NAMESPACE_MATH, XML_MATHCOLOR, XML_TOK_MATHCOLOR },
2096	XML_TOKEN_MAP_END	2103	XML_TOKEN_MAP_END
2097	};	2104	};
2098		2105
Lines 2150-2162 static __FAR_DATA SvXMLTokenMapEntry aColorTokenMap[] = Link Here
2150	{ XML_NAMESPACE_MATH, XML_RED, TRED},	2157	{ XML_NAMESPACE_MATH, XML_RED, TRED},
2151	{ XML_NAMESPACE_MATH, XML_GREEN, TGREEN},	2158	{ XML_NAMESPACE_MATH, XML_GREEN, TGREEN},
2152	{ XML_NAMESPACE_MATH, XML_BLUE, TBLUE},	2159	{ XML_NAMESPACE_MATH, XML_BLUE, TBLUE},
2153	{ XML_NAMESPACE_MATH, XML_AQUA, TCYAN},	2160	{ XML_NAMESPACE_MATH, XML_AQUA, TAQUA},
2154	{ XML_NAMESPACE_MATH, XML_FUCHSIA, TMAGENTA},	2161	{ XML_NAMESPACE_MATH, XML_FUCHSIA, TFUCHSIA},
2155	{ XML_NAMESPACE_MATH, XML_YELLOW, TYELLOW},	2162	{ XML_NAMESPACE_MATH, XML_YELLOW, TYELLOW},
		2163	{ XML_NAMESPACE_MATH, XML_NAVY, TNAVY},
		2164	{ XML_NAMESPACE_MATH, XML_TEAL, TTEAL},
		2165	{ XML_NAMESPACE_MATH, XML_MAROON, TMAROON},
		2166	{ XML_NAMESPACE_MATH, XML_PURPLE, TPURPLE},
		2167	{ XML_NAMESPACE_MATH, XML_OLIVE, TOLIVE},
		2168	{ XML_NAMESPACE_MATH, XML_GRAY, TGRAY},
		2169	{ XML_NAMESPACE_MATH, XML_SILVER, TSILVER},
		2170	{ XML_NAMESPACE_MATH, XML_LIME, TLIME},
2156	XML_TOKEN_MAP_END	2171	XML_TOKEN_MAP_END
2157	};	2172	};
2158		2173
2159
2160	////////////////////////////////////////////////////////////	2174	////////////////////////////////////////////////////////////
2161		2175
2162	const SvXMLTokenMap& SmXMLImport::GetPresLayoutElemTokenMap()	2176	const SvXMLTokenMap& SmXMLImport::GetPresLayoutElemTokenMap()

Lines 292-298 enum SmXMLPresLayoutAttrTokenMap Link Here

(-)a/main/starmath/source/mathmlimport.hxx (-1 / +2 lines)
292	XML_TOK_FONTSTYLE,	292	XML_TOK_FONTSTYLE,
293	XML_TOK_FONTSIZE,	293	XML_TOK_FONTSIZE,
294	XML_TOK_FONTFAMILY,	294	XML_TOK_FONTFAMILY,
295	XML_TOK_COLOR	295	XML_TOK_COLOR,
		296	XML_TOK_MATHCOLOR
296	};	297	};
297		298
298		299




		case TYELLOW:
			APPEND(rText,"color yellow ");
			break;
        case TTEAL:
            APPEND(rText,"color teal");
            break;
        case TSILVER:
            APPEND(rText,"color silver");
            break;
        case TGRAY:
            APPEND(rText,"color gray");
            break;
        case TMAROON:
            APPEND(rText,"color maroon");
            break;
        case TPURPLE:
            APPEND(rText,"color purple");
            break;
        case TLIME:
            APPEND(rText,"color lime");
            break;
        case TOLIVE:
            APPEND(rText,"color olive");
            break;
        case TNAVY:
            APPEND(rText,"color navy");
            break;
        case TAQUA:
            APPEND(rText,"color aqua");
            break;
        case TFUCHSIA:
            APPEND(rText,"color fuchsia");
            break;
		case TSANS:
			APPEND(rText,"font sans ");
			break;


		case TBLACK :	SetColor(Color(COL_BLACK));		break;
		case TWHITE :	SetColor(Color(COL_WHITE));		break;
		case TRED :		SetColor(Color(COL_LIGHTRED));		break;
		case TGREEN :	SetColor(Color(COL_GREEN));		break;
		case TBLUE :	SetColor(Color(COL_LIGHTBLUE));		break;
		case TCYAN :	SetColor(Color(COL_LIGHTCYAN));		break; // as in Calc
		case TMAGENTA :	SetColor(Color(COL_LIGHTMAGENTA));	break; // as in Calc
		case TYELLOW :	SetColor(Color(COL_YELLOW));	break;
        case TTEAL :    SetColor(Color(COL_CYAN));  break;
        case TSILVER :  SetColor(Color(COL_LIGHTGRAY));  break;
        case TGRAY :    SetColor(Color(COL_GRAY));  break;
        case TMAROON :  SetColor(Color(COL_RED));  break;
        case TPURPLE :  SetColor(Color(COL_MAGENTA));  break;
        case TLIME :    SetColor(Color(COL_LIGHTGREEN));  break;
        case TOLIVE :   SetColor(Color(COL_BROWN));  break;
        case TNAVY :    SetColor(Color(COL_BLUE));  break;
        case TAQUA :    SetColor(Color(COL_LIGHTCYAN));  break;
        case TFUCHSIA : SetColor(Color(COL_LIGHTMAGENTA));  break;

		default:
			DBG_ASSERT(sal_False, "Sm: unbekannter Fall");




	{ "alignt", TALIGNC, '\0', TGALIGN | TGDISCARDED, 0},
	{ "and", TAND, MS_AND, TGPRODUCT, 0},
	{ "approx", TAPPROX, MS_APPROX, TGRELATION, 0},
    { "aqua", TAQUA, '\0', TGCOLOR, 0},
	{ "arccos", TACOS, '\0', TGFUNCTION, 5},
	{ "arccot", TACOT, '\0', TGFUNCTION, 5},
	{ "arcsin", TASIN, '\0', TGFUNCTION, 5},

	{ "font", TFONT, '\0', TGFONTATTR, 5},
	{ "forall", TFORALL, MS_FORALL, TGSTANDALONE, 5},
	{ "from", TFROM, '\0', TGLIMIT, 0},
    { "fuchsia", TFUCHSIA, '\0', TGCOLOR, 0},
	{ "func", TFUNC, '\0', TGFUNCTION, 5},
	{ "ge", TGE, MS_GE, TGRELATION, 0},
	{ "geslant", TGESLANT, MS_GESLANT, TGRELATION, 0 },
	{ "gg", TGG, MS_GG, TGRELATION, 0},
	{ "grave", TGRAVE, MS_GRAVE, TGATTRIBUT, 5},
    { "gray", TGRAY, '\0', TGCOLOR, 0},
	{ "green", TGREEN, '\0', TGCOLOR, 0},
	{ "gt", TGT, MS_GT, TGRELATION, 0},
	{ "hat", THAT, MS_HAT, TGATTRIBUT, 5},

	{ "leslant", TLESLANT, MS_LESLANT, TGRELATION, 0 },
	{ "lfloor", TLFLOOR, MS_LFLOOR, TGLBRACES, 5},
	{ "lim", TLIM, '\0', TGOPER, 5},
    { "lime", TLIME, '\0', TGCOLOR, 0},
	{ "liminf", TLIMINF, '\0', TGOPER, 5},
	{ "limsup", TLIMSUP, '\0', TGOPER, 5},
	{ "lint", TLINT, MS_LINT, TGOPER, 5},

	{ "lsup", TLSUP, '\0', TGPOWER, 0},
	{ "lt", TLT, MS_LT, TGRELATION, 0},
	{ "magenta", TMAGENTA, '\0', TGCOLOR, 0},
    { "maroon", TMAROON, '\0', TGCOLOR, 0},
	{ "matrix", TMATRIX, '\0', 0, 5},
	{ "minusplus", TMINUSPLUS, MS_MINUSPLUS, TGUNOPER | TGSUM, 5},
	{ "mline", TMLINE, MS_LINE, 0, 0},		//! nicht in TGRBRACES, Level 0
	{ "nabla", TNABLA, MS_NABLA, TGSTANDALONE, 5},
    { "navy", TNAVY, '\0', TGCOLOR, 0},
	{ "nbold", TNBOLD, '\0', TGFONTATTR, 5},
	{ "ndivides", TNDIVIDES, MS_NDIVIDES, TGRELATION, 0},
	{ "neg", TNEG, MS_NEG, TGUNOPER, 5 },

	{ "nsupseteq", TNSUPSETEQ, MS_NSUPSETEQ, TGRELATION, 0 },
	{ "odivide", TODIVIDE, MS_ODIVIDE, TGPRODUCT, 0},
	{ "odot", TODOT, MS_ODOT, TGPRODUCT, 0},
    { "olive", TOLIVE, '\0', TGCOLOR, 0},
	{ "ominus", TOMINUS, MS_OMINUS, TGSUM, 0},
	{ "oper", TOPER, '\0', TGOPER, 5},
	{ "oplus", TOPLUS, MS_OPLUS, TGSUM, 0},

	{ "plusminus", TPLUSMINUS, MS_PLUSMINUS, TGUNOPER | TGSUM, 5},
	{ "prod", TPROD, MS_PROD, TGOPER, 5},
	{ "prop", TPROP, MS_PROP, TGRELATION, 0},
    { "purple", TPURPLE, '\0', TGCOLOR, 0},
	{ "rangle", TRANGLE, MS_RANGLE, TGRBRACES, 0},	//! 0 to terminate expression
	{ "rbrace", TRBRACE, MS_RBRACE, TGRBRACES, 0},	//
	{ "rceil", TRCEIL, MS_RCEIL, TGRBRACES, 0},	//

	{ "setR" , TSETR, MS_SETR, TGSTANDALONE, 5},
	{ "setZ" , TSETZ, MS_SETZ, TGSTANDALONE, 5},
	{ "setminus", TBACKSLASH, MS_BACKSLASH, TGPRODUCT, 0 },
    { "silver", TSILVER, '\0', TGCOLOR, 0},
	{ "sim", TSIM, MS_SIM, TGRELATION, 0},
	{ "simeq", TSIMEQ, MS_SIMEQ, TGRELATION, 0},
	{ "sin", TSIN, '\0', TGFUNCTION, 5},

	{ "supseteq", TSUPSETEQ, MS_SUPSETEQ, TGRELATION, 0},
	{ "tan", TTAN, '\0', TGFUNCTION, 5},
	{ "tanh", TTANH, '\0', TGFUNCTION, 5},
    { "teal", TTEAL, '\0', TGCOLOR, 0},
	{ "tilde", TTILDE, MS_TILDE, TGATTRIBUT, 5},
	{ "times", TTIMES, MS_TIMES, TGPRODUCT, 0},
	{ "to", TTO, '\0', TGLIMIT, 0},

Return to issue 118191

Lines 1281-1286 void SmXMLExport::ExportFont(const SmNode *pNode, int nLevel) Link Here

(-)a/main/starmath/source/mathmlexport.cxx (+30 lines)
1281	case TYELLOW:	1281	case TYELLOW:
1282	AddAttribute(XML_NAMESPACE_MATH, XML_COLOR, XML_YELLOW);	1282	AddAttribute(XML_NAMESPACE_MATH, XML_COLOR, XML_YELLOW);
1283	break;	1283	break;
		1284	case TSILVER:
		1285	AddAttribute(XML_NAMESPACE_MATH, XML_COLOR, XML_SILVER);
		1286	break;
		1287	case TGRAY:
		1288	AddAttribute(XML_NAMESPACE_MATH, XML_COLOR, XML_GRAY);
		1289	break;
		1290	case TMAROON:
		1291	AddAttribute(XML_NAMESPACE_MATH, XML_COLOR, XML_MAROON);
		1292	break;
		1293	case TOLIVE:
		1294	AddAttribute(XML_NAMESPACE_MATH, XML_COLOR, XML_OLIVE);
		1295	break;
		1296	case TLIME:
		1297	AddAttribute(XML_NAMESPACE_MATH, XML_COLOR, XML_LIME);
		1298	break;
		1299	case TAQUA:
		1300	AddAttribute(XML_NAMESPACE_MATH, XML_COLOR, XML_AQUA);
		1301	break;
		1302	case TTEAL:
		1303	AddAttribute(XML_NAMESPACE_MATH, XML_COLOR, XML_TEAL);
		1304	break;
		1305	case TNAVY:
		1306	AddAttribute(XML_NAMESPACE_MATH, XML_COLOR, XML_NAVY);
		1307	break;
		1308	case TFUCHSIA:
		1309	AddAttribute(XML_NAMESPACE_MATH, XML_COLOR, XML_FUCHSIA);
		1310	break;
		1311	case TPURPLE:
		1312	AddAttribute(XML_NAMESPACE_MATH, XML_COLOR, XML_PURPLE);
		1313	break;
1284	case TSIZE:	1314	case TSIZE:
1285	{	1315	{
1286	const SmFontNode pFontNode = static_cast<const SmFontNode >(pNode);	1316	const SmFontNode pFontNode = static_cast<const SmFontNode >(pNode);

Lines 2060-2065 void SmFontNode::CreateTextFromNode(String &rText) Link Here

(-)a/main/starmath/source/node.cxx (-4 / +44 lines)
2060	case TYELLOW:	2060	case TYELLOW:
2061	APPEND(rText,"color yellow ");	2061	APPEND(rText,"color yellow ");
2062	break;	2062	break;
		2063	case TTEAL:
		2064	APPEND(rText,"color teal");
		2065	break;
		2066	case TSILVER:
		2067	APPEND(rText,"color silver");
		2068	break;
		2069	case TGRAY:
		2070	APPEND(rText,"color gray");
		2071	break;
		2072	case TMAROON:
		2073	APPEND(rText,"color maroon");
		2074	break;
		2075	case TPURPLE:
		2076	APPEND(rText,"color purple");
		2077	break;
		2078	case TLIME:
		2079	APPEND(rText,"color lime");
		2080	break;
		2081	case TOLIVE:
		2082	APPEND(rText,"color olive");
		2083	break;
		2084	case TNAVY:
		2085	APPEND(rText,"color navy");
		2086	break;
		2087	case TAQUA:
		2088	APPEND(rText,"color aqua");
		2089	break;
		2090	case TFUCHSIA:
		2091	APPEND(rText,"color fuchsia");
		2092	break;
2063	case TSANS:	2093	case TSANS:
2064	APPEND(rText,"font sans ");	2094	APPEND(rText,"font sans ");
2065	break;	2095	break;
Lines 2125-2136 void SmFontNode::Arrange(const OutputDevice &rDev, const SmFormat &rFormat) Link Here
2125		2155
2126	case TBLACK : SetColor(Color(COL_BLACK)); break;	2156	case TBLACK : SetColor(Color(COL_BLACK)); break;
2127	case TWHITE : SetColor(Color(COL_WHITE)); break;	2157	case TWHITE : SetColor(Color(COL_WHITE)); break;
2128	case TRED : SetColor(Color(COL_RED)); break;	2158	case TRED : SetColor(Color(COL_LIGHTRED)); break;
2129	case TGREEN : SetColor(Color(COL_GREEN)); break;	2159	case TGREEN : SetColor(Color(COL_GREEN)); break;
2130	case TBLUE : SetColor(Color(COL_BLUE)); break;	2160	case TBLUE : SetColor(Color(COL_LIGHTBLUE)); break;
2131	case TCYAN : SetColor(Color(COL_CYAN)); break;	2161	case TCYAN : SetColor(Color(COL_LIGHTCYAN)); break; // as in Calc
2132	case TMAGENTA : SetColor(Color(COL_MAGENTA)); break;	2162	case TMAGENTA : SetColor(Color(COL_LIGHTMAGENTA)); break; // as in Calc
2133	case TYELLOW : SetColor(Color(COL_YELLOW)); break;	2163	case TYELLOW : SetColor(Color(COL_YELLOW)); break;
		2164	case TTEAL : SetColor(Color(COL_CYAN)); break;
		2165	case TSILVER : SetColor(Color(COL_LIGHTGRAY)); break;
		2166	case TGRAY : SetColor(Color(COL_GRAY)); break;
		2167	case TMAROON : SetColor(Color(COL_RED)); break;
		2168	case TPURPLE : SetColor(Color(COL_MAGENTA)); break;
		2169	case TLIME : SetColor(Color(COL_LIGHTGREEN)); break;
		2170	case TOLIVE : SetColor(Color(COL_BROWN)); break;
		2171	case TNAVY : SetColor(Color(COL_BLUE)); break;
		2172	case TAQUA : SetColor(Color(COL_LIGHTCYAN)); break;
		2173	case TFUCHSIA : SetColor(Color(COL_LIGHTMAGENTA)); break;
2134		2174
2135	default:	2175	default:
2136	DBG_ASSERT(sal_False, "Sm: unbekannter Fall");	2176	DBG_ASSERT(sal_False, "Sm: unbekannter Fall");

Lines 130-135 static const SmTokenTableEntry aTokenTable[] = Link Here

(-)a/main/starmath/source/parse.cxx (+10 lines)
130	{ "alignt", TALIGNC, '\0', TGALIGN \| TGDISCARDED, 0},	130	{ "alignt", TALIGNC, '\0', TGALIGN \| TGDISCARDED, 0},
131	{ "and", TAND, MS_AND, TGPRODUCT, 0},	131	{ "and", TAND, MS_AND, TGPRODUCT, 0},
132	{ "approx", TAPPROX, MS_APPROX, TGRELATION, 0},	132	{ "approx", TAPPROX, MS_APPROX, TGRELATION, 0},
		133	{ "aqua", TAQUA, '\0', TGCOLOR, 0},
133	{ "arccos", TACOS, '\0', TGFUNCTION, 5},	134	{ "arccos", TACOS, '\0', TGFUNCTION, 5},
134	{ "arccot", TACOT, '\0', TGFUNCTION, 5},	135	{ "arccot", TACOT, '\0', TGFUNCTION, 5},
135	{ "arcsin", TASIN, '\0', TGFUNCTION, 5},	136	{ "arcsin", TASIN, '\0', TGFUNCTION, 5},
Lines 183-193 static const SmTokenTableEntry aTokenTable[] = Link Here
183	{ "font", TFONT, '\0', TGFONTATTR, 5},	184	{ "font", TFONT, '\0', TGFONTATTR, 5},
184	{ "forall", TFORALL, MS_FORALL, TGSTANDALONE, 5},	185	{ "forall", TFORALL, MS_FORALL, TGSTANDALONE, 5},
185	{ "from", TFROM, '\0', TGLIMIT, 0},	186	{ "from", TFROM, '\0', TGLIMIT, 0},
		187	{ "fuchsia", TFUCHSIA, '\0', TGCOLOR, 0},
186	{ "func", TFUNC, '\0', TGFUNCTION, 5},	188	{ "func", TFUNC, '\0', TGFUNCTION, 5},
187	{ "ge", TGE, MS_GE, TGRELATION, 0},	189	{ "ge", TGE, MS_GE, TGRELATION, 0},
188	{ "geslant", TGESLANT, MS_GESLANT, TGRELATION, 0 },	190	{ "geslant", TGESLANT, MS_GESLANT, TGRELATION, 0 },
189	{ "gg", TGG, MS_GG, TGRELATION, 0},	191	{ "gg", TGG, MS_GG, TGRELATION, 0},
190	{ "grave", TGRAVE, MS_GRAVE, TGATTRIBUT, 5},	192	{ "grave", TGRAVE, MS_GRAVE, TGATTRIBUT, 5},
		193	{ "gray", TGRAY, '\0', TGCOLOR, 0},
191	{ "green", TGREEN, '\0', TGCOLOR, 0},	194	{ "green", TGREEN, '\0', TGCOLOR, 0},
192	{ "gt", TGT, MS_GT, TGRELATION, 0},	195	{ "gt", TGT, MS_GT, TGRELATION, 0},
193	{ "hat", THAT, MS_HAT, TGATTRIBUT, 5},	196	{ "hat", THAT, MS_HAT, TGATTRIBUT, 5},
Lines 213-218 static const SmTokenTableEntry aTokenTable[] = Link Here
213	{ "leslant", TLESLANT, MS_LESLANT, TGRELATION, 0 },	216	{ "leslant", TLESLANT, MS_LESLANT, TGRELATION, 0 },
214	{ "lfloor", TLFLOOR, MS_LFLOOR, TGLBRACES, 5},	217	{ "lfloor", TLFLOOR, MS_LFLOOR, TGLBRACES, 5},
215	{ "lim", TLIM, '\0', TGOPER, 5},	218	{ "lim", TLIM, '\0', TGOPER, 5},
		219	{ "lime", TLIME, '\0', TGCOLOR, 0},
216	{ "liminf", TLIMINF, '\0', TGOPER, 5},	220	{ "liminf", TLIMINF, '\0', TGOPER, 5},
217	{ "limsup", TLIMSUP, '\0', TGOPER, 5},	221	{ "limsup", TLIMSUP, '\0', TGOPER, 5},
218	{ "lint", TLINT, MS_LINT, TGOPER, 5},	222	{ "lint", TLINT, MS_LINT, TGOPER, 5},
Lines 226-235 static const SmTokenTableEntry aTokenTable[] = Link Here
226	{ "lsup", TLSUP, '\0', TGPOWER, 0},	230	{ "lsup", TLSUP, '\0', TGPOWER, 0},
227	{ "lt", TLT, MS_LT, TGRELATION, 0},	231	{ "lt", TLT, MS_LT, TGRELATION, 0},
228	{ "magenta", TMAGENTA, '\0', TGCOLOR, 0},	232	{ "magenta", TMAGENTA, '\0', TGCOLOR, 0},
		233	{ "maroon", TMAROON, '\0', TGCOLOR, 0},
229	{ "matrix", TMATRIX, '\0', 0, 5},	234	{ "matrix", TMATRIX, '\0', 0, 5},
230	{ "minusplus", TMINUSPLUS, MS_MINUSPLUS, TGUNOPER \| TGSUM, 5},	235	{ "minusplus", TMINUSPLUS, MS_MINUSPLUS, TGUNOPER \| TGSUM, 5},
231	{ "mline", TMLINE, MS_LINE, 0, 0}, //! nicht in TGRBRACES, Level 0	236	{ "mline", TMLINE, MS_LINE, 0, 0}, //! nicht in TGRBRACES, Level 0
232	{ "nabla", TNABLA, MS_NABLA, TGSTANDALONE, 5},	237	{ "nabla", TNABLA, MS_NABLA, TGSTANDALONE, 5},
		238	{ "navy", TNAVY, '\0', TGCOLOR, 0},
233	{ "nbold", TNBOLD, '\0', TGFONTATTR, 5},	239	{ "nbold", TNBOLD, '\0', TGFONTATTR, 5},
234	{ "ndivides", TNDIVIDES, MS_NDIVIDES, TGRELATION, 0},	240	{ "ndivides", TNDIVIDES, MS_NDIVIDES, TGRELATION, 0},
235	{ "neg", TNEG, MS_NEG, TGUNOPER, 5 },	241	{ "neg", TNEG, MS_NEG, TGUNOPER, 5 },
Lines 247-252 static const SmTokenTableEntry aTokenTable[] = Link Here
247	{ "nsupseteq", TNSUPSETEQ, MS_NSUPSETEQ, TGRELATION, 0 },	253	{ "nsupseteq", TNSUPSETEQ, MS_NSUPSETEQ, TGRELATION, 0 },
248	{ "odivide", TODIVIDE, MS_ODIVIDE, TGPRODUCT, 0},	254	{ "odivide", TODIVIDE, MS_ODIVIDE, TGPRODUCT, 0},
249	{ "odot", TODOT, MS_ODOT, TGPRODUCT, 0},	255	{ "odot", TODOT, MS_ODOT, TGPRODUCT, 0},
		256	{ "olive", TOLIVE, '\0', TGCOLOR, 0},
250	{ "ominus", TOMINUS, MS_OMINUS, TGSUM, 0},	257	{ "ominus", TOMINUS, MS_OMINUS, TGSUM, 0},
251	{ "oper", TOPER, '\0', TGOPER, 5},	258	{ "oper", TOPER, '\0', TGOPER, 5},
252	{ "oplus", TOPLUS, MS_OPLUS, TGSUM, 0},	259	{ "oplus", TOPLUS, MS_OPLUS, TGSUM, 0},
Lines 264-269 static const SmTokenTableEntry aTokenTable[] = Link Here
264	{ "plusminus", TPLUSMINUS, MS_PLUSMINUS, TGUNOPER \| TGSUM, 5},	271	{ "plusminus", TPLUSMINUS, MS_PLUSMINUS, TGUNOPER \| TGSUM, 5},
265	{ "prod", TPROD, MS_PROD, TGOPER, 5},	272	{ "prod", TPROD, MS_PROD, TGOPER, 5},
266	{ "prop", TPROP, MS_PROP, TGRELATION, 0},	273	{ "prop", TPROP, MS_PROP, TGRELATION, 0},
		274	{ "purple", TPURPLE, '\0', TGCOLOR, 0},
267	{ "rangle", TRANGLE, MS_RANGLE, TGRBRACES, 0}, //! 0 to terminate expression	275	{ "rangle", TRANGLE, MS_RANGLE, TGRBRACES, 0}, //! 0 to terminate expression
268	{ "rbrace", TRBRACE, MS_RBRACE, TGRBRACES, 0}, //	276	{ "rbrace", TRBRACE, MS_RBRACE, TGRBRACES, 0}, //
269	{ "rceil", TRCEIL, MS_RCEIL, TGRBRACES, 0}, //	277	{ "rceil", TRCEIL, MS_RCEIL, TGRBRACES, 0}, //
Lines 284-289 static const SmTokenTableEntry aTokenTable[] = Link Here
284	{ "setR" , TSETR, MS_SETR, TGSTANDALONE, 5},	292	{ "setR" , TSETR, MS_SETR, TGSTANDALONE, 5},
285	{ "setZ" , TSETZ, MS_SETZ, TGSTANDALONE, 5},	293	{ "setZ" , TSETZ, MS_SETZ, TGSTANDALONE, 5},
286	{ "setminus", TBACKSLASH, MS_BACKSLASH, TGPRODUCT, 0 },	294	{ "setminus", TBACKSLASH, MS_BACKSLASH, TGPRODUCT, 0 },
		295	{ "silver", TSILVER, '\0', TGCOLOR, 0},
287	{ "sim", TSIM, MS_SIM, TGRELATION, 0},	296	{ "sim", TSIM, MS_SIM, TGRELATION, 0},
288	{ "simeq", TSIMEQ, MS_SIMEQ, TGRELATION, 0},	297	{ "simeq", TSIMEQ, MS_SIMEQ, TGRELATION, 0},
289	{ "sin", TSIN, '\0', TGFUNCTION, 5},	298	{ "sin", TSIN, '\0', TGFUNCTION, 5},
Lines 301-306 static const SmTokenTableEntry aTokenTable[] = Link Here
301	{ "supseteq", TSUPSETEQ, MS_SUPSETEQ, TGRELATION, 0},	310	{ "supseteq", TSUPSETEQ, MS_SUPSETEQ, TGRELATION, 0},
302	{ "tan", TTAN, '\0', TGFUNCTION, 5},	311	{ "tan", TTAN, '\0', TGFUNCTION, 5},
303	{ "tanh", TTANH, '\0', TGFUNCTION, 5},	312	{ "tanh", TTANH, '\0', TGFUNCTION, 5},
		313	{ "teal", TTEAL, '\0', TGCOLOR, 0},
304	{ "tilde", TTILDE, MS_TILDE, TGATTRIBUT, 5},	314	{ "tilde", TTILDE, MS_TILDE, TGATTRIBUT, 5},
305	{ "times", TTIMES, MS_TIMES, TGPRODUCT, 0},	315	{ "times", TTIMES, MS_TIMES, TGPRODUCT, 0},
306	{ "to", TTO, '\0', TGLIMIT, 0},	316	{ "to", TTO, '\0', TGLIMIT, 0},