openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From msei...@apache.org
Subject svn commit: r1862429 - in /openoffice/branches/AOO42X: ./ main/default_images/starmath/res/ main/helpcontent2/source/text/smath/01/ main/starmath/source/
Date Tue, 02 Jul 2019 14:36:12 GMT
Author: mseidel
Date: Tue Jul  2 14:36:12 2019
New Revision: 1862429

URL: http://svn.apache.org/viewvc?rev=1862429&view=rev
Log:
Merged r1862234 and r1862415 from tunk

Added two elements to Math toolbox, cleaned up whitespace
Adding two new symbols to help (Math)

Added:
    openoffice/branches/AOO42X/main/default_images/starmath/res/un21222.png
      - copied unchanged from r1862234, openoffice/trunk/main/default_images/starmath/res/un21222.png
    openoffice/branches/AOO42X/main/default_images/starmath/res/un21223.png
      - copied unchanged from r1862234, openoffice/trunk/main/default_images/starmath/res/un21223.png
    openoffice/branches/AOO42X/main/default_images/starmath/res/unh21222.png
      - copied unchanged from r1862234, openoffice/trunk/main/default_images/starmath/res/unh21222.png
    openoffice/branches/AOO42X/main/default_images/starmath/res/unh21223.png
      - copied unchanged from r1862234, openoffice/trunk/main/default_images/starmath/res/unh21223.png
Modified:
    openoffice/branches/AOO42X/   (props changed)
    openoffice/branches/AOO42X/main/helpcontent2/source/text/smath/01/03091501.xhp
    openoffice/branches/AOO42X/main/starmath/source/toolbox.src

Propchange: openoffice/branches/AOO42X/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jul  2 14:36:12 2019
@@ -9,4 +9,4 @@
 /openoffice/branches/ia2:1417739-1541842
 /openoffice/branches/ooxml-osba:1546391,1546395,1546574,1546934,1547030,1547392,1551920,1551954,1551958,1552283
 /openoffice/branches/rejuvenate01:1480411,1534063,1534098,1536312,1549902,1560617
-/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853245,1853252,1853285-1853286,1853299,1853319,1853327,1853443-1853444,1853456,1853466,1853504,1853558,1853643,1853668,1853670,1853726,1853742,1853972,1853976,1854051,1854065,1854176,1854196,1854324-1854325,1854473,1854519,1854740,1854788,1854852,1854933,1855053,1855140,1855181,1855246,1855509,1855523,1855617,1855647,1855649,1855778,1855813,1855926,1855947,1856034,1856079,1856113,1856224,1856555,1856677,1856833,1856899,1857186,1857302,1857311,1857450-1857451,1857877-1857878,1857899-1857900,1858000,1858167,1858209,1858284,1858381-1858382,1858505,1858511,1858682,1858700,1858940,1858942,1858949,1859148,1859223,1859362-1859363,1859486,1859491,1859582,1859636,1859657,1859668,1859685,1859827,1859839,186
 0288,1860381,1860383,1860448,1860636,1860664,1860680,1860684,1860690,1860707,1860718,1860845,1860851,1861192,1861305,1861368,1861483,1861512,1861563,1861567,1861660,1861664-1861665,1861790,1861946,1861956,1862194,1862416,1862420
+/openoffice/trunk:1851110-1851111,1851115,1851118,1851121,1851206,1851214-1851215,1851443,1851449,1851464,1851575,1851634,1851637,1851639,1851715,1851753,1851813,1851987,1852008,1852010,1852029,1852046,1852174,1852187,1852190,1852197,1852430,1852438,1852623-1852624,1852841,1852965,1853175,1853245,1853252,1853285-1853286,1853299,1853319,1853327,1853443-1853444,1853456,1853466,1853504,1853558,1853643,1853668,1853670,1853726,1853742,1853972,1853976,1854051,1854065,1854176,1854196,1854324-1854325,1854473,1854519,1854740,1854788,1854852,1854933,1855053,1855140,1855181,1855246,1855509,1855523,1855617,1855647,1855649,1855778,1855813,1855926,1855947,1856034,1856079,1856113,1856224,1856555,1856677,1856833,1856899,1857186,1857302,1857311,1857450-1857451,1857877-1857878,1857899-1857900,1858000,1858167,1858209,1858284,1858381-1858382,1858505,1858511,1858682,1858700,1858940,1858942,1858949,1859148,1859223,1859362-1859363,1859486,1859491,1859582,1859636,1859657,1859668,1859685,1859827,1859839,186
 0288,1860381,1860383,1860448,1860636,1860664,1860680,1860684,1860690,1860707,1860718,1860845,1860851,1861192,1861305,1861368,1861483,1861512,1861563,1861567,1861660,1861664-1861665,1861790,1861946,1861956,1862194,1862234,1862415-1862416,1862420

Modified: openoffice/branches/AOO42X/main/helpcontent2/source/text/smath/01/03091501.xhp
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/helpcontent2/source/text/smath/01/03091501.xhp?rev=1862429&r1=1862428&r2=1862429&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/helpcontent2/source/text/smath/01/03091501.xhp (original)
+++ openoffice/branches/AOO42X/main/helpcontent2/source/text/smath/01/03091501.xhp Tue Jul
 2 14:36:12 2019
@@ -1,9 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
-
-
 <!--***********************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -11,22 +8,21 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  ***********************************************************-->
 
 
 
-
-		<helpdocument version="1.0">
+<helpdocument version="1.0">
 <meta>
 <topic id="textsmath0103091501xml" indexer="include" status="PUBLISH">
 <title id="tit" xml-lang="en-US">Unary and Binary Operators</title>
@@ -391,7 +387,9 @@
 </paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id4930875" xml-lang="en-US" l10n="NEW">No symbol.</paragraph>
+<paragraph role="tablecontent" id="par_id4930875" xml-lang="en-US" l10n="NEW">
+<image id="Graphic17" src="starmath/res/un21223.png" width="0.3335inch" height="0.3335inch"><alt
id="alt_" xml-lang="en-US">Icon</alt>
+</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
 <paragraph role="tablecontent" id="par_id3149241" xml-lang="en-US" l10n="U" oldref="415">Backslash
\ between two characters, of which the right is superscript, the left subscript</paragraph>
@@ -404,7 +402,9 @@
 </paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
-<paragraph role="tablecontent" id="par_id4568620" xml-lang="en-US" l10n="NEW">No symbol.</paragraph>
+<paragraph role="tablecontent" id="par_id4568620" xml-lang="en-US" l10n="NEW">
+<image id="Graphic18" src="starmath/res/un21222.png" width="0.3335inch" height="0.3335inch"><alt
id="alt_" xml-lang="en-US">Icon</alt>
+</image></paragraph>
 </tablecell>
 <tablecell colspan="" rowspan="">
 <paragraph role="tablecontent" id="par_id3155587" xml-lang="en-US" l10n="U" oldref="413">Slash
/ between two characters, of which the left is superscript, the right subscript</paragraph>

Modified: openoffice/branches/AOO42X/main/starmath/source/toolbox.src
URL: http://svn.apache.org/viewvc/openoffice/branches/AOO42X/main/starmath/source/toolbox.src?rev=1862429&r1=1862428&r2=1862429&view=diff
==============================================================================
--- openoffice/branches/AOO42X/main/starmath/source/toolbox.src (original)
+++ openoffice/branches/AOO42X/main/starmath/source/toolbox.src Tue Jul  2 14:36:12 2019
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,21 +7,20 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
 
 
-
 #include <sfx2/sfx.hrc>
 #include <svx/globlmn.hrc>
 #include "starmath.hrc"
@@ -40,99 +39,99 @@ FloatingWindow RID_TOOLBOXWINDOW
 	Hide = TRUE ;
 	OutputSize = TRUE ;
 	SVLook = TRUE ;
-    Size = MAP_APPFONT ( 0 , 0 ) ;  // to be calculated programmatically
-    Text [ en-US ] = "Elements" ;
+	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_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" ;
+			};
+		};
+	};
 
-    ToolBox TOOLBOX_CAT_A
+	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 ) ;
+		Pos = MAP_APPFONT ( 0, 45 ) ;
+		Size = MAP_APPFONT ( 65, 95 ) ;
 		SVLook = TRUE ;
 		Hide = TRUE ;
-		LineCount = 4 ;
+		LineCount = 5 ;
 
 		ItemList =
 		{
@@ -242,17 +241,33 @@ FloatingWindow RID_TOOLBOXWINDOW
 			{
 				Identifier = RID_XCIRCY ;
 				HelpId = HID_SMA_XCIRCY ;
-				Text [ en-US ] = "Concatenate";
+				Text [ en-US ] = "Concatenate" ;
+			};
+			ToolBoxItem
+			{
+				Type = TOOLBOXITEM_BREAK ;
+			};
+			ToolBoxItem
+			{
+				Identifier = RID_XWIDESLASHY ;
+				HelpId = HID_SMA_XWIDESLASHY ;
+				Text [ en-US ] = "Wide Slash" ;
+			};
+			ToolBoxItem
+			{
+				Identifier = RID_XWIDEBSLASHY ;
+				HelpId = HID_SMA_XWIDEBSLASHY ;
+				Text [ en-US ] = "Wide Backslash" ;
 			};
 		};
 	};
-    
-    ToolBox TOOLBOX_CAT_B
+
+	ToolBox TOOLBOX_CAT_B
 	{
 		// relations
 		HelpId = HID_SMA_RELATIONS_TBX ;
-        Pos = MAP_APPFONT ( 0 , 45 ) ;
-		Size = MAP_APPFONT ( 65 , 95 ) ;
+		Pos = MAP_APPFONT ( 0, 45 ) ;
+		Size = MAP_APPFONT ( 65, 95 ) ;
 		SVLook = TRUE ;
 		Hide = TRUE ;
 		LineCount = 5 ;
@@ -280,13 +295,13 @@ FloatingWindow RID_TOOLBOXWINDOW
 			{
 				Identifier = RID_XDIVIDESY ;
 				HelpId = HID_SMA_XDIVIDESY ;
-				Text [ en-US ] = "Divides";
+				Text [ en-US ] = "Divides" ;
 			};
 			ToolBoxItem
 			{
 				Identifier = RID_XNDIVIDESY ;
 				HelpId = HID_SMA_XNDIVIDESY ;
-				Text [ en-US ] = "Does Not Divide";
+				Text [ en-US ] = "Does Not Divide" ;
 			};
 			ToolBoxItem
 			{
@@ -308,7 +323,6 @@ FloatingWindow RID_TOOLBOXWINDOW
 			{
 				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
@@ -395,29 +409,29 @@ FloatingWindow RID_TOOLBOXWINDOW
 			{
 				Identifier = RID_DLARROW ;
 				HelpId = HID_SMA_DLARROW ;
-				Text [ en-US ] = "Double Arrow Left";
+				Text [ en-US ] = "Double Arrow Left" ;
 			};
 			ToolBoxItem
 			{
 				Identifier = RID_DLRARROW ;
 				HelpId = HID_SMA_DLRARROW ;
-				Text [ en-US ] = "Double Arrow Left And Right";
+				Text [ en-US ] = "Double Arrow Left And Right" ;
 			};
 			ToolBoxItem
 			{
 				Identifier = RID_DRARROW ;
 				HelpId = HID_SMA_DRARROW ;
-				Text [ en-US ] = "Double Arrow Right";
+				Text [ en-US ] = "Double Arrow Right" ;
 			};
 		};
 	};
-    
-    ToolBox TOOLBOX_CAT_C
+
+	ToolBox TOOLBOX_CAT_C
 	{
 		// set operations
 		HelpId = HID_SMA_SETOPERATIONS_TBX ;
-        Pos = MAP_APPFONT ( 0 , 45 ) ;
-		Size = MAP_APPFONT ( 65 , 95 ) ;
+		Pos = MAP_APPFONT ( 0, 45 ) ;
+		Size = MAP_APPFONT ( 65, 95 ) ;
 		SVLook = TRUE ;
 		Hide = TRUE ;
 		LineCount = 5 ;
@@ -449,7 +463,7 @@ FloatingWindow RID_TOOLBOXWINDOW
 			{
 				Identifier = RID_EMPTYSET ;
 				HelpId = HID_SMA_EMPTYSET ;
-				Text [ en-US ] = "Empty Set";
+				Text [ en-US ] = "Empty Set" ;
 			};
 			ToolBoxItem
 			{
@@ -483,7 +497,7 @@ FloatingWindow RID_TOOLBOXWINDOW
 			{
 				Identifier = RID_ALEPH ;
 				HelpId = HID_SMA_ALEPH ;
-				Text [ en-US ] = "Aleph";
+				Text [ en-US ] = "Aleph" ;
 			};
 			ToolBoxItem
 			{
@@ -557,41 +571,41 @@ FloatingWindow RID_TOOLBOXWINDOW
 			{
 				Identifier = RID_SETN ;
 				HelpId = HID_SMA_SETN ;
-				Text [ en-US ] = "Natural Numbers Set";
+				Text [ en-US ] = "Natural Numbers Set" ;
 			};
 			ToolBoxItem
 			{
 				Identifier = RID_SETZ ;
 				HelpId = HID_SMA_SETZ ;
-				Text [ en-US ] = "Integers Set";
+				Text [ en-US ] = "Integers Set" ;
 			};
 			ToolBoxItem
 			{
 				Identifier = RID_SETQ ;
 				HelpId = HID_SMA_SETQ ;
-				Text [ en-US ] = "Set of Rational Numbers";
+				Text [ en-US ] = "Rational Numbers Set" ;
 			};
 			ToolBoxItem
 			{
 				Identifier = RID_SETR ;
 				HelpId = HID_SMA_SETR ;
-				Text [ en-US ] = "Real Numbers Set";
+				Text [ en-US ] = "Real Numbers Set" ;
 			};
 			ToolBoxItem
 			{
 				Identifier = RID_SETC ;
 				HelpId = HID_SMA_SETC ;
-				Text [ en-US ] = "Complex Numbers Set";
+				Text [ en-US ] = "Complex Numbers Set" ;
 			};
 		};
 	};
-    
-    ToolBox TOOLBOX_CAT_D
+
+	ToolBox TOOLBOX_CAT_D
 	{
 		// functions
 		HelpId = HID_SMA_FUNCTIONS_TBX ;
-        Pos = MAP_APPFONT ( 0 , 45 ) ;
-		Size = MAP_APPFONT ( 65 , 95 ) ;
+		Pos = MAP_APPFONT ( 0, 45 ) ;
+		Size = MAP_APPFONT ( 65, 95 ) ;
 		SVLook = TRUE ;
 		Hide = TRUE ;
 		LineCount = 5 ;
@@ -625,7 +639,7 @@ FloatingWindow RID_TOOLBOXWINDOW
 			{
 				Identifier = RID_RSUPX ;
 				HelpId = HID_SMA_RSUPX ;
-				Text [ en-US ] = "Power";
+				Text [ en-US ] = "Power" ;
 			};
 			ToolBoxItem
 			{
@@ -765,13 +779,13 @@ FloatingWindow RID_TOOLBOXWINDOW
 			};
 		};
 	};
-    
-    ToolBox TOOLBOX_CAT_E
+
+	ToolBox TOOLBOX_CAT_E
 	{
 		// operators
 		HelpId = HID_SMA_OPERATORS_TBX ;
-        Pos = MAP_APPFONT ( 0 , 45 ) ;
-		Size = MAP_APPFONT ( 65 , 95 ) ;
+		Pos = MAP_APPFONT ( 0, 45 ) ;
+		Size = MAP_APPFONT ( 65, 95 ) ;
 		SVLook = TRUE ;
 		Hide = TRUE ;
 		LineCount = 3 ;
@@ -873,13 +887,13 @@ FloatingWindow RID_TOOLBOXWINDOW
 			};
 		};
 	};
-    
-    ToolBox TOOLBOX_CAT_F
+
+	ToolBox TOOLBOX_CAT_F
 	{
 		// attributs
 		HelpId = HID_SMA_ATTRIBUTES_TBX ;
-        Pos = MAP_APPFONT ( 0 , 45 ) ;
-		Size = MAP_APPFONT ( 65 , 95 ) ;
+		Pos = MAP_APPFONT ( 0, 45 ) ;
+		Size = MAP_APPFONT ( 65, 95 ) ;
 		SVLook = TRUE ;
 		Hide = TRUE ;
 		LineCount = 5 ;
@@ -889,13 +903,13 @@ FloatingWindow RID_TOOLBOXWINDOW
 			{
 				Identifier = RID_ACUTEX ;
 				HelpId = HID_SMA_ACUTEX ;
-				Text [ en-US ] = "Acute Accent";
+				Text [ en-US ] = "Acute Accent" ;
 			};
 			ToolBoxItem
 			{
 				Identifier = RID_GRAVEX ;
 				HelpId = HID_SMA_GRAVEX ;
-				Text [ en-US ] = "Grave Accent";
+				Text [ en-US ] = "Grave Accent" ;
 			};
 			ToolBoxItem
 			{
@@ -957,19 +971,19 @@ FloatingWindow RID_TOOLBOXWINDOW
 			{
 				Identifier = RID_WIDEVECX ;
 				HelpId = HID_SMA_WIDEVECX ;
-				Text [ en-US ] = "Large Vector Arrow";
+				Text [ en-US ] = "Large Vector Arrow" ;
 			};
 			ToolBoxItem
 			{
 				Identifier = RID_WIDETILDEX ;
 				HelpId = HID_SMA_WIDETILDEX ;
-				Text [ en-US ] = "Large Tilde";
+				Text [ en-US ] = "Large Tilde" ;
 			};
 			ToolBoxItem
 			{
 				Identifier = RID_WIDEHATX ;
 				HelpId = HID_SMA_WIDEHATX ;
-				Text [ en-US ] = "Large Circumflex";
+				Text [ en-US ] = "Large Circumflex" ;
 			};
 			ToolBoxItem
 			{
@@ -1049,13 +1063,13 @@ FloatingWindow RID_TOOLBOXWINDOW
 			};
 		};
 	};
-    
-    ToolBox TOOLBOX_CAT_G
+
+	ToolBox TOOLBOX_CAT_G
 	{
 		// parentheses
 		HelpId = HID_SMA_BRACKETS_TBX ;
-        Pos = MAP_APPFONT ( 0 , 45 ) ;
-		Size = MAP_APPFONT ( 65 , 95 ) ;
+		Pos = MAP_APPFONT ( 0, 45 ) ;
+		Size = MAP_APPFONT ( 65, 95 ) ;
 		SVLook = TRUE ;
 		Hide = TRUE ;
 		LineCount = 5 ;
@@ -1077,7 +1091,7 @@ FloatingWindow RID_TOOLBOXWINDOW
 			{
 				Identifier = RID_LRDBRACKETX ;
 				HelpId = HID_SMA_LRDBRACKETX ;
-				Text [ en-US ] = "Double Square Brackets";
+				Text [ en-US ] = "Double Square Brackets" ;
 			};
 			ToolBoxItem
 			{
@@ -1111,7 +1125,7 @@ FloatingWindow RID_TOOLBOXWINDOW
 			{
 				Identifier = RID_LMRANGLEXY ;
 				HelpId = HID_SMA_LMRANGLEXY ;
-				Text [ en-US ] = "Operator Brackets";
+				Text [ en-US ] = "Operator Brackets" ;
 			};
 			ToolBoxItem
 			{
@@ -1143,7 +1157,7 @@ FloatingWindow RID_TOOLBOXWINDOW
 			{
 				Identifier = RID_SLRDBRACKETX ;
 				HelpId = HID_SMA_SLRDBRACKETX ;
-				Text [ en-US ] = "Double Square Brackets (Scalable)";
+				Text [ en-US ] = "Double Square Brackets (Scalable)" ;
 			};
 			ToolBoxItem
 			{
@@ -1177,7 +1191,7 @@ FloatingWindow RID_TOOLBOXWINDOW
 			{
 				Identifier = RID_SLMRANGLEXY ;
 				HelpId = HID_SMA_SLMRANGLEXY ;
-				Text [ en-US ] = "Operator Brackets (Scalable)";
+				Text [ en-US ] = "Operator Brackets (Scalable)" ;
 			};
 			ToolBoxItem
 			{
@@ -1187,23 +1201,23 @@ FloatingWindow RID_TOOLBOXWINDOW
 			{
 				Identifier = RID_XOVERBRACEY ;
 				HelpId = HID_SMA_XOVERBRACEY ;
-				Text [ en-US ] = "Braces Top (Scalable)";
+				Text [ en-US ] = "Braces Top (Scalable)" ;
 			};
 			ToolBoxItem
 			{
 				Identifier = RID_XUNDERBRACEY ;
 				HelpId = HID_SMA_XUNDERBRACEY ;
-				Text [ en-US ] = "Braces Bottom (Scalable)";
+				Text [ en-US ] = "Braces Bottom (Scalable)" ;
 			};
 		};
 	};
-    
-    ToolBox TOOLBOX_CAT_H
+
+	ToolBox TOOLBOX_CAT_H
 	{
 		// format
 		HelpId = HID_SMA_FORMAT_TBX ;
-        Pos = MAP_APPFONT ( 0 , 45 ) ;
-		Size = MAP_APPFONT ( 65 , 95 ) ;
+		Pos = MAP_APPFONT ( 0, 45 ) ;
+		Size = MAP_APPFONT ( 65, 95 ) ;
 		SVLook = TRUE ;
 		Hide = TRUE ;
 		LineCount = 3 ;
@@ -1253,7 +1267,7 @@ FloatingWindow RID_TOOLBOXWINDOW
 			{
 				Identifier = RID_CSUBX ;
 				HelpId = HID_SMA_CSUBX ;
-				Text [ en-US ] = "Subscript Bottom";
+				Text [ en-US ] = "Subscript Bottom" ;
 			};
 			ToolBoxItem
 			{
@@ -1309,13 +1323,13 @@ FloatingWindow RID_TOOLBOXWINDOW
 			};
 		};
 	};
-    
-    ToolBox TOOLBOX_CAT_I
+
+	ToolBox TOOLBOX_CAT_I
 	{
 		// misc
 		HelpId = HID_SMA_FORMAT_TBX ;
-        Pos = MAP_APPFONT ( 0 , 45 ) ;
-		Size = MAP_APPFONT ( 65 , 95 ) ;
+		Pos = MAP_APPFONT ( 0, 45 ) ;
+		Size = MAP_APPFONT ( 65, 95 ) ;
 		SVLook = TRUE ;
 		Hide = TRUE ;
 		LineCount = 4 ;
@@ -1325,31 +1339,31 @@ FloatingWindow RID_TOOLBOXWINDOW
 			{
 				Identifier = RID_INFINITY ;
 				HelpId = HID_SMA_INFINITY ;
-				Text [ en-US ] = "infinite";
+				Text [ en-US ] = "infinite" ;
 			};
 			ToolBoxItem
 			{
 				Identifier = RID_PARTIAL ;
 				HelpId = HID_SMA_PARTIAL ;
-				Text [ en-US ] = "Partial";
+				Text [ en-US ] = "Partial" ;
 			};
 			ToolBoxItem
 			{
 				Identifier = RID_NABLA ;
 				HelpId = HID_SMA_NABLA ;
-				Text [ en-US ] = "Nabla";
+				Text [ en-US ] = "Nabla" ;
 			};
 			ToolBoxItem
 			{
 				Identifier = RID_EXISTS ;
 				HelpId = HID_SMA_EXISTS ;
-				Text [ en-US ] = "There Exists";
+				Text [ en-US ] = "There Exists" ;
 			};
 			ToolBoxItem
 			{
 				Identifier = RID_FORALL ;
 				HelpId = HID_SMA_FORALL ;
-				Text [ en-US ] = "For All";
+				Text [ en-US ] = "For All" ;
 			};
 			ToolBoxItem
 			{
@@ -1359,31 +1373,31 @@ FloatingWindow RID_TOOLBOXWINDOW
 			{
 				Identifier = RID_HBAR ;
 				HelpId = HID_SMA_HBAR ;
-				Text [ en-US ] = "h Bar";
+				Text [ en-US ] = "h Bar" ;
 			};
 			ToolBoxItem
 			{
 				Identifier = RID_LAMBDABAR ;
 				HelpId = HID_SMA_LAMBDABAR ;
-				Text [ en-US ] = "Lambda Bar";
+				Text [ en-US ] = "Lambda Bar" ;
 			};
 			ToolBoxItem
 			{
 				Identifier = RID_RE ;
 				HelpId = HID_SMA_RE ;
-				Text [ en-US ] = "Real Part";
+				Text [ en-US ] = "Real Part" ;
 			};
 			ToolBoxItem
 			{
 				Identifier = RID_IM ;
 				HelpId = HID_SMA_IM ;
-				Text [ en-US ] = "Imaginary Part";
+				Text [ en-US ] = "Imaginary Part" ;
 			};
 			ToolBoxItem
 			{
 				Identifier = RID_WP ;
 				HelpId = HID_SMA_WP ;
-				Text [ en-US ] = "Weierstrass p";
+				Text [ en-US ] = "Weierstrass p" ;
 			};
 			ToolBoxItem
 			{
@@ -1393,25 +1407,25 @@ FloatingWindow RID_TOOLBOXWINDOW
 			{
 				Identifier = RID_LEFTARROW ;
 				HelpId = HID_SMA_LEFTARROW ;
-				Text [ en-US ] = "Left Arrow";
+				Text [ en-US ] = "Left Arrow" ;
 			};
 			ToolBoxItem
 			{
 				Identifier = RID_RIGHTARROW ;
 				HelpId = HID_SMA_RIGHTARROW ;
-				Text [ en-US ] = "Right Arrow";
+				Text [ en-US ] = "Right Arrow" ;
 			};
 			ToolBoxItem
 			{
 				Identifier = RID_UPARROW ;
 				HelpId = HID_SMA_UPARROW ;
-				Text [ en-US ] = "Up Arrow";
+				Text [ en-US ] = "Up Arrow" ;
 			};
 			ToolBoxItem
 			{
 				Identifier = RID_DOWNARROW ;
 				HelpId = HID_SMA_DOWNARROW ;
-				Text [ en-US ] = "Down Arrow";
+				Text [ en-US ] = "Down Arrow" ;
 			};
 			ToolBoxItem
 			{
@@ -1425,31 +1439,31 @@ FloatingWindow RID_TOOLBOXWINDOW
 			{
 				Identifier = RID_DOTSLOW ;
 				HelpId = HID_SMA_DOTSLOW ;
-				Text [ en-US ] = "Dots At Bottom";
+				Text [ en-US ] = "Dots At Bottom" ;
 			};
 			ToolBoxItem
 			{
 				Identifier = RID_DOTSAXIS ;
 				HelpId = HID_SMA_DOTSAXIS ;
-				Text [ en-US ] = "Dots In Middle";
+				Text [ en-US ] = "Dots In Middle" ;
 			};
 			ToolBoxItem
 			{
 				Identifier = RID_DOTSVERT ;
 				HelpId = HID_SMA_DOTSVERT ;
-				Text [ en-US ] = "Dots Vertically";
+				Text [ en-US ] = "Dots Vertically" ;
 			};
 			ToolBoxItem
 			{
 				Identifier = RID_DOTSUP ;
 				HelpId = HID_SMA_DOTSUP ;
-				Text [ en-US ] = "Dots To Top";
+				Text [ en-US ] = "Dots To Top" ;
 			};
 			ToolBoxItem
 			{
 				Identifier = RID_DOTSDOWN ;
 				HelpId = HID_SMA_DOTSDOWN ;
-				Text [ en-US ] = "Dots to Bottom";
+				Text [ en-US ] = "Dots To Bottom" ;
 			};
 		};
 	};
@@ -1457,377 +1471,378 @@ FloatingWindow RID_TOOLBOXWINDOW
 
 
 
-#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
-    };
+#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 ;		\
+		RID_XWIDESLASHY ;	\
+		RID_XWIDEBSLASHY ;	\
+	};						\
+	IdCount = { 18 ; };
+
+	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
+	};
 
+// ********************************************************************** EOF



Mime
View raw message