Fix bug 2698 (new images from Uwe Stöhr)

	* src/frontends/controllers/ControlMath.C
	(latex_misc): Add intop and ointop

	* lib/images/math/intop.xpm: New
	* lib/images/math/ointop.xpm: Ditto

	* lib/images/math/int.xpm: Add box to make the difference to intop clear
	* lib/images/math/oint.xpm: ditto

	* lib/Makefile.am: add new files

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@14924 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 8b3b5c8da0020354c8fab6d75f1a501e510a33cd..341d46b50630a6b8e323b7189fa2314f9336d4a2 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -410,6 +410,7 @@ dist_imagesmath_DATA = \
        images/math/infty.xpm \
        images/math/int.xpm \
        images/math/intercal.xpm \
+       images/math/intop.xpm \
        images/math/iota.xpm \
        images/math/jmath.xpm \
        images/math/kappa.xpm \
@@ -534,6 +535,7 @@ dist_imagesmath_DATA = \
        images/math/nwarrow.xpm \
        images/math/odot.xpm \
        images/math/oint.xpm \
+       images/math/ointop.xpm \
        images/math/omega.xpm \
        images/math/omega2.xpm \
        images/math/ominus.xpm \

diff --git a/lib/images/math/int.xpm b/lib/images/math/int.xpm
index 4de1736265090e4b98af0f5291e8ff0b414313de..54f571907a5d733b3b32959b9617a9f06fe73d57 100644 (file)
--- a/lib/images/math/int.xpm
+++ b/lib/images/math/int.xpm
@@ -1,48 +1,35 @@
 /* XPM */
-static char const * const int_xpm[] = {
-/* width height ncolors chars_per_pixel */
-"18 25 16 1",
-/* colors */
-"O c None",
+static char *a[] = {
+/* columns rows colors chars-per-pixel */
+"17 26 3 1",
 "  c #000000",
-". c #939393",
-"X c #676767",
-"o c #3B3B3B",
-"+ c #CECECE",
-"@ c #0F0F0F",
-"# c #B0B0B0",
-"$ c #A2A2A2",
-"% c #848484",
-"& c #767676",
-"* c #585858",
-"= c #4A4A4A",
-"- c #2C2C2C",
-"; c #1E1E1E",
-": c #BFBFBF",
+". c #000000",
+"X c None",
 /* pixels */
-"OOOOOOOOOOOOOOOOOO",
-"OOOOOOOOOOOOOOOOOO",
-"OOOOOOOOOOO.@oOOOO",
-"OOOOOOOOOOO=+OOOOO",
-"OOOOOOOOOO#XOOOOOO",
-"OOOOOOOOOO&%OOOOOO",
-"OOOOOOOOOO=:OOOOOO",
-"OOOOOOOOOO@OOOOOOO",
-"OOOOOOOOO#oOOOOOOO",
-"OOOOOOOOO&XOOOOOOO",
-"OOOOOOOOO*&OOOOOOO",
-"OOOOOOOOO;$OOOOOOO",
-"OOOOOOOO+ +OOOOOOO",
-"OOOOOOOO$;OOOOOOOO",
-"OOOOOOOOX=OOOOOOOO",
-"OOOOOOOO*XOOOOOOOO",
-"OOOOOOOO-$OOOOOOOO",
-"OOOOOOOO OOOOOOOOO",
-"OOOOOOO#-OOOOOOOOO",
-"OOOOOOO.XOOOOOOOOO",
-"OOOOOOOX.OOOOOOOOO",
-"OOOOOOOo+OOOOOOOOO",
-"OOOOOO+-OOOOOOOOOO",
-"OOOOO-X%OOOOOOOOOO",
-"OOOOO=oOOOOOOOOOOO"
+"XXXXXXXXXX...XXXX",
+"XXXXXXXXX.....XXX",
+"XXXXXXXX..XXX.XXX",
+"XXXXXXXX..XX..XXX",
+"XXXXXXXX..XXXXXXX",
+"XXXXXXX..XXXXXXXX",
+"XXXXXXX..XXXXXXXX",
+"XXXXXXX..XXXXXXXX",
+"XXXXXXX..XXXXXXXX",
+"XXXXXXX..XXXXXXXX",
+"XXXXXXX..XXXXXXXX",
+"XXXXXXX..XXXXXXXX",
+"XXXXXXX..XXXXXXXX",
+"XXXXXX..XXXXXXXXX",
+"XXXXXX..XXXXXXXXX",
+"XXXXXX..XXXXXXXXX",
+"XXXXXX..XXXXXXXXX",
+"XXXXXX..XXXXXXXXX",
+"XXXXXX..XXXXXXXXX",
+"XXXXXX..XXXXXXXXX",
+"XXXXXX..XXXXXXXXX",
+"XXXXX..XX.X.X.X.X",
+"X..XX..XXXXXXXXXX",
+"X.XXX..XX.XXXXX.X",
+"X.....XXXXXXXXXXX",
+"XX...XXXX.X.X.X.X"
 };

diff --git a/lib/images/math/intop.xpm b/lib/images/math/intop.xpm
new file mode 100644 (file)
index 0000000..465bafd
--- /dev/null
+++ b/lib/images/math/intop.xpm
@@ -0,0 +1,41 @@
+/* XPM */
+static char *a[] = {
+/* columns rows colors chars-per-pixel */
+"15 32 3 1",
+"  c #000000",
+". c #000000",
+"X c None",
+/* pixels */
+"XXXXXXXXXX...XX",
+"XXXXXXXXX.....X",
+"XXXXXXXX..XXX.X",
+"XXXXXXXX..XX..X",
+"XXXXXXXX..XXXXX",
+"XXXXXXX..XXXXXX",
+"XXXXXXX..XXXXXX",
+"XXXXXXX..XXXXXX",
+"XXXXXXX..XXXXXX",
+"XXXXXXX..XXXXXX",
+"XXXXXXX..XXXXXX",
+"XXXXXXX..XXXXXX",
+"XXXXXXX..XXXXXX",
+"XXXXXX..XXXXXXX",
+"XXXXXX..XXXXXXX",
+"XXXXXX..XXXXXXX",
+"XXXXXX..XXXXXXX",
+"XXXXXX..XXXXXXX",
+"XXXXXX..XXXXXXX",
+"XXXXXX..XXXXXXX",
+"XXXXXX..XXXXXXX",
+"XXXXX..XXXXXXXX",
+"X..XX..XXXXXXXX",
+"X.XXX..XXXXXXXX",
+"X.....XXXXXXXXX",
+"XX...XXXXXXXXXX",
+"XXXXXXXXXXXXXXX",
+"XXXX.X.X.X.XXXX",
+"XXXXXXXXXXXXXXX",
+"XXXX.XXXXX.XXXX",
+"XXXXXXXXXXXXXXX",
+"XXXX.X.X.X.XXXX",
+};

diff --git a/lib/images/math/oint.xpm b/lib/images/math/oint.xpm
index 20d2a340d0ea6ff22aa3445ae2654974024aa79b..420a98651f6a5df65d24f4446f286501123a0599 100644 (file)
--- a/lib/images/math/oint.xpm
+++ b/lib/images/math/oint.xpm
@@ -1,35 +1,35 @@
 /* XPM */
 static char *a[] = {
 /* columns rows colors chars-per-pixel */
-"13 26 3 1",
+"15 26 3 1",
 "  c #000000",
 ". c #000000",
 "X c None",
 /* pixels */
-"XXXXXXXXX...X",
-"XXXXXXXX.....",
-"XXXXXXX..XXX.",
-"XXXXXXX..XX..",
-"XXXXXXX..XXXX",
-"XXXXXX..XXXXX",
-"XXXXXX..XXXXX",
-"XXXXXX..XXXXX",
-"XXXXXX..XXXXX",
-"XXXX.....XXXX",
-"XX...X....XXX",
-"X..XXX..XX.XX",
-"X..XXX..XX.XX",
-"X..XX..XXX.XX",
-"X...X..XXX.XX",
-"XX.....X..XXX",
-"XXXX....XXXXX",
-"XXXXX..XXXXXX",
-"XXXXX..XXXXXX",
-"XXXXX..XXXXXX",
-"XXXXX..XXXXXX",
-"XXXX..XXXXXXX",
-"..XX..XXXXXXX",
-".XXX..XXXXXXX",
-".....XXXXXXXX",
-"X...XXXXXXXXX"
+"XXXXXXXXX...XXX",
+"XXXXXXXX.....XX",
+"XXXXXXX..XXX.XX",
+"XXXXXXX..XX..XX",
+"XXXXXXX..XXXXXX",
+"XXXXXX..XXXXXXX",
+"XXXXXX..XXXXXXX",
+"XXXXXX..XXXXXXX",
+"XXXXXX..XXXXXXX",
+"XXXX.....XXXXXX",
+"XX...X....XXXXX",
+"X..XXX..XX.XXXX",
+"X..XXX..XX.XXXX",
+"X..XX..XXX.XXXX",
+"X...X..XXX.XXXX",
+"XX.....X..XXXXX",
+"XXXX....XXXXXXX",
+"XXXXX..XXXXXXXX",
+"XXXXX..XXXXXXXX",
+"XXXXX..XXXXXXXX",
+"XXXXX..XXXXXXXX",
+"XXXX..XX.X.X.X.",
+"..XX..XXXXXXXXX",
+".XXX..XX.XXXXX.",
+".....XXXXXXXXXX",
+"X...XXXX.X.X.X."
 };

diff --git a/lib/images/math/ointop.xpm b/lib/images/math/ointop.xpm
new file mode 100644 (file)
index 0000000..58fdda0
--- /dev/null
+++ b/lib/images/math/ointop.xpm
@@ -0,0 +1,41 @@
+/* XPM */
+static char *a[] = {
+/* columns rows colors chars-per-pixel */
+"13 32 3 1",
+"  c #000000",
+". c #000000",
+"X c None",
+/* pixels */
+"XXXXXXXXX...X",
+"XXXXXXXX.....",
+"XXXXXXX..XXX.",
+"XXXXXXX..XX..",
+"XXXXXXX..XXXX",
+"XXXXXX..XXXXX",
+"XXXXXX..XXXXX",
+"XXXXXX..XXXXX",
+"XXXXXX..XXXXX",
+"XXXX.....XXXX",
+"XX...X....XXX",
+"X..XXX..XX.XX",
+"X..XXX..XX.XX",
+"X..XX..XXX.XX",
+"X...X..XXX.XX",
+"XX.....X..XXX",
+"XXXX....XXXXX",
+"XXXXX..XXXXXX",
+"XXXXX..XXXXXX",
+"XXXXX..XXXXXX",
+"XXXXX..XXXXXX",
+"XXXX..XXXXXXX",
+"..XX..XXXXXXX",
+".XXX..XXXXXXX",
+".....XXXXXXXX",
+"X...XXXXXXXXX",
+"XXXXXXXXXXXXX",
+"XXX.X.X.X.XXX",
+"XXXXXXXXXXXXX",
+"XXX.XXXXX.XXX",
+"XXXXXXXXXXXXX",
+"XXX.X.X.X.XXX",
+};

diff --git a/src/frontends/controllers/ControlMath.C b/src/frontends/controllers/ControlMath.C
index b730228ba12ebc97300f1820203d3f81c203e8ca..d8de40c68bf360f12a7ac3750dd9974000b2715f 100644 (file)
--- a/src/frontends/controllers/ControlMath.C
+++ b/src/frontends/controllers/ControlMath.C
@@ -194,7 +194,7 @@ char const * latex_misc[] = {
 int const nr_latex_misc = sizeof(latex_misc) / sizeof(char const *);
 
 char const * latex_varsz[] = {
-       "sum", "int", "oint",
+       "sum", "int", "intop", "oint", "ointop",
        "prod", "coprod", "bigsqcup",
        "bigotimes", "bigodot", "bigoplus",
        "bigcap", "bigcup", "biguplus",