Am Donnerstag, 14. September 2006 18:16 schrieb Jean-Marc Lasgouttes:
>
> We are pretty close now. The bugs assigned to 1.4.3 are:
>
> 1473 Method to insert vphantom-buttom
>
> The patch is in, all the remains is adding the buttons. Shall we do
> it now?
I'd say yes. Uwe misunderstood me, I originally did not want to include
this in 1.4.3, but since we have the icons now I don't see any reason not
to include them. I changed the colors a bit because I thought the light
grey might not be distinguishable from the background in some themes.
Is the attached patch OK?
> As you can see, we are almost ready to go. I propose to do the release
> on next tuesday or wednesday. Would that be OK?
Yes.
Georg
Index: src/frontends/controllers/ControlMath.C
===================================================================
--- src/frontends/controllers/ControlMath.C (Revision 14998)
+++ src/frontends/controllers/ControlMath.C (Arbeitskopie)
@@ -182,7 +182,8 @@ char const * latex_misc[] = {
"mathbb N", "mathbb Z", "mathbb Q",
"mathbb R", "mathbb C", "mathbb H",
"mathcal F", "mathcal L",
- "mathcal H", "mathcal O", ""
+ "mathcal H", "mathcal O",
+ "phantom", "vphantom", "hphantom", ""
};
int const nr_latex_misc = sizeof(latex_misc) / sizeof(char const *);
Index: status.14x
===================================================================
--- status.14x (Revision 14998)
+++ status.14x (Arbeitskopie)
@@ -29,7 +29,6 @@ What's new
- Add buttons for \intop and \ointop to the math panel (bug 2698)
- Native support for \phantom, \hphantom and \vphantom in mathed (bug 1473).
- There is no Menu/Toolbar/Math panel entry yet, only display on screen.
- Some small updates to the documentation.
Index: lib/images/math/hphantom.xpm
===================================================================
--- lib/images/math/hphantom.xpm (Revision 0)
+++ lib/images/math/hphantom.xpm (Revision 0)
@@ -0,0 +1,43 @@
+/* XPM */
+static char *hphantom[] = {
+/* columns rows colors chars-per-pixel */
+"30 32 5 1",
+" c brown",
+". c #FFFF33340000",
+"X c #41416969E1E1",
+"o c black",
+"O c None",
+/* pixels */
+"ooooOOOooooooOOOoooooOOOoooooo",
+"ooooOOOooooooOOOoooooOOOoooooo",
+"OOOOOOOOOOOOXXXXXXOOOOOOOOOOOO",
+"OOOOOOOOOOOOXXXXXXXOOOOOOOOOOO",
+"OOOOOOOOOOOXXXXXXXXOOOOOOOOOoo",
+"ooOOOOOOOOOXXXXXXXXXOOOOOOOOoo",
+"ooOOOOOOOOXXXXXXXXXXXOOOOOOOoo",
+"ooOOOOOOOOXXXXXXXXXXXOOOOOOOoo",
+"ooOOOOOOOOXXXXXXXXXXXOOOOOOOoo",
+"ooOOOOOOOXXXXXOOOXXXXOOOOOOOoo",
+"ooOOOO OOXXXXXOOOXXXXXO OOOOOO",
+"OOOOO OOXXXXOOOOOXXXXO OOOOO",
+"OOOO OOXXXXXOOOOOXXXXOO OOOO",
+"OOO OOOXXXXXOOOOOXXXXXOO Ooo",
+"oo. OOOXXXXXOOOOOOXXXXXXOO .oo",
+"oo oo",
+"oo. OOOXXXXXOOOOOOOXXXXXOO .oo",
+"ooO OOXXXXOOOOOOOOXXXXXO Ooo",
+"ooOO XXXXXOOOOOOOOXXXXX OOOO",
+"OOOOO XXXXXXXXXXXXXXXX OOOOO",
+"OOOOOX XXXXXXXXXXXXXXXX XOOOOO",
+"OOOOOXXXXXXXXXXXXXXXXXXXXXOOoo",
+"ooOOOXXXXXXXXXXXXXXXXXXXXXOOoo",
+"ooOOXXXXXXXXXXXXXXXXXXXXXXOOoo",
+"ooOOXXXXXOOOOOOOOOOOOOXXXXXOoo",
+"ooOXXXXXXOOOOOOOOOOOOOXXXXXOoo",
+"ooOXXXXXOOOOOOOOOOOOOOXXXXXXoo",
+"OOXXXXXXOOOOOOOOOOOOOOOXXXXXOO",
+"OOXXXXXXOOOOOOOOOOOOOOOXXXXXOO",
+"OOXXXXXOOOOOOOOOOOOOOOOXXXXXOO",
+"ooooooOOOooooooOOOoooooOOOoooo",
+"ooooooOOOooooooOOOoooooOOOoooo",
+};
Eigenschaftsänderungen: lib/images/math/hphantom.xpm
___________________________________________________________________
Name: svn:eol-style
+ native
Index: lib/images/math/phantom.xpm
===================================================================
--- lib/images/math/phantom.xpm (Revision 0)
+++ lib/images/math/phantom.xpm (Revision 0)
@@ -0,0 +1,43 @@
+/* XPM */
+static char *phantom[] = {
+/* columns rows colors chars-per-pixel */
+"30 32 5 1",
+" c brown",
+". c #FFFF33340000",
+"X c #41416969E1E1",
+"o c black",
+"O c None",
+/* pixels */
+"ooooOOOooooooOOOoooooOOOoooooo",
+"ooooOOOooooooOOOoooooOOOoooooo",
+"OOOOOOOOOOOOXX. .XOOOOOOOOOOOO",
+"OOOOOOOOOOOOX XOOOOOOOOOOO",
+"OOOOOOOOOOOX X X OOOOOOOOOoo",
+"ooOOOOOOOOO XX XX OOOOOOOOoo",
+"ooOOOOOOOO XXX XXX OOOOOOOoo",
+"ooOOOOOOOOXXXXX XXXXXOOOOOOOoo",
+"ooOOOOOOOOXXXXX XXXXXOOOOOOOoo",
+"ooOOOOOOOXXXXXX XXXXXOOOOOOOoo",
+"ooOOOO OOXXXXXO OXXXXXO OOOOOO",
+"OOOOO OOXXXXXO OXXXXXO OOOOO",
+"OOOO OOXXXXXOO OOXXXXOO OOOO",
+"OOO OOOXXXXXOO OOXXXXXOO Ooo",
+"oo. OOOXXXXXOOO OOXXXXXXOO .oo",
+"oo oo",
+"oo. OOOXXXXXOOO OOOXXXXXOO .oo",
+"ooO OOXXXXOOOO OOOXXXXXO Ooo",
+"ooOO XXXXXOOOO OOOXXXXX OOOO",
+"OOOOO XXXXXXXX XXXXXXX OOOOO",
+"OOOOOX XXXXXXXX XXXXXXX XOOOOO",
+"OOOOOXXXXXXXXXX XXXXXXXXXXOOoo",
+"ooOOOXXXXXXXXXX XXXXXXXXXXOOoo",
+"ooOOXXXXXXXXXXX XXXXXXXXXXOOoo",
+"ooOOXXXXXOOOOOO OOOOOOXXXXXOoo",
+"ooOXXXXXXO OOO OOO OXXXXXOoo",
+"ooOXXXXXOOO OO OO OOXXXXXXoo",
+"OOXXXXXXOOOO O O OOOOXXXXXOO",
+"OOXXXXXXOOOOO OOOOOXXXXXOO",
+"OOXXXXXOOOOOOO. .OOOOOOXXXXXOO",
+"ooooooOOOooooooOOOoooooOOOoooo",
+"ooooooOOOooooooOOOoooooOOOoooo",
+};
Eigenschaftsänderungen: lib/images/math/phantom.xpm
___________________________________________________________________
Name: svn:eol-style
+ native
Index: lib/images/math/vphantom.xpm
===================================================================
--- lib/images/math/vphantom.xpm (Revision 0)
+++ lib/images/math/vphantom.xpm (Revision 0)
@@ -0,0 +1,43 @@
+/* XPM */
+static char *vphantom[] = {
+/* columns rows colors chars-per-pixel */
+"30 32 5 1",
+" c brown",
+". c #FFFF33340000",
+"X c #41416969E1E1",
+"o c black",
+"O c None",
+/* pixels */
+"ooooOOOooooooOOOoooooOOOoooooo",
+"ooooOOOooooooOOOoooooOOOoooooo",
+"OOOOOOOOOOOOXX. .XOOOOOOOOOOOO",
+"OOOOOOOOOOOOX XOOOOOOOOOOO",
+"OOOOOOOOOOOX X X OOOOOOOOOoo",
+"ooOOOOOOOOO XX XX OOOOOOOOoo",
+"ooOOOOOOOO XXX XXX OOOOOOOoo",
+"ooOOOOOOOOXXXXX XXXXXOOOOOOOoo",
+"ooOOOOOOOOXXXXX XXXXXOOOOOOOoo",
+"ooOOOOOOOXXXXXX XXXXXOOOOOOOoo",
+"ooOOOOOOOXXXXXO OXXXXXOOOOOOOO",
+"OOOOOOOOOXXXXXO OXXXXXOOOOOOOO",
+"OOOOOOOOXXXXXOO OOXXXXOOOOOOOO",
+"OOOOOOOOXXXXXOO OOXXXXXOOOOOoo",
+"ooOOOOOXXXXXOOO OOXXXXXXOOOOoo",
+"ooOOOOOXXXXXOOO OOOXXXXXOOOOoo",
+"ooOOOOOXXXXXOOO OOOXXXXXOOOOoo",
+"ooOOOOOXXXXOOOO OOOXXXXXOOOOoo",
+"ooOOOOXXXXXOOOO OOOXXXXXOOOOOO",
+"OOOOOOXXXXXXXXX XXXXXXXXXOOOOO",
+"OOOOOXXXXXXXXXX XXXXXXXXXOOOOO",
+"OOOOOXXXXXXXXXX XXXXXXXXXXOOoo",
+"ooOOOXXXXXXXXXX XXXXXXXXXXOOoo",
+"ooOOXXXXXXXXXXX XXXXXXXXXXOOoo",
+"ooOOXXXXXOOOOOO OOOOOOXXXXXOoo",
+"ooOXXXXXXO OOO OOO OXXXXXOoo",
+"ooOXXXXXOOO OO OO OOXXXXXXoo",
+"OOXXXXXXOOOO O O OOOOXXXXXOO",
+"OOXXXXXXOOOOO OOOOOXXXXXOO",
+"OOXXXXXOOOOOOO. .OOOOOOXXXXXOO",
+"ooooooOOOooooooOOOoooooOOOoooo",
+"ooooooOOOooooooOOOoooooOOOoooo",
+};
Eigenschaftsänderungen: lib/images/math/vphantom.xpm
___________________________________________________________________
Name: svn:eol-style
+ native
Index: lib/Makefile.am
===================================================================
--- lib/Makefile.am (Revision 14998)
+++ lib/Makefile.am (Arbeitskopie)
@@ -405,6 +405,7 @@ dist_imagesmath_DATA = \
images/math/heartsuit.xpm \
images/math/hookleftarrow.xpm \
images/math/hookrightarrow.xpm \
+ images/math/hphantom.xpm \
images/math/hslash.xpm \
images/math/imath.xpm \
images/math/in.xpm \
@@ -552,6 +553,7 @@ dist_imagesmath_DATA = \
images/math/parallel.xpm \
images/math/partial.xpm \
images/math/perp.xpm \
+ images/math/phantom.xpm \
images/math/phi.xpm \
images/math/phi2.xpm \
images/math/pi.xpm \
@@ -698,6 +700,7 @@ dist_imagesmath_DATA = \
images/math/vec.xpm \
images/math/vee.xpm \
images/math/veebar.xpm \
+ images/math/vphantom.xpm \
images/math/wedge.xpm \
images/math/widehat.xpm \
images/math/widetilde.xpm \
Index: development/scons/scons_manifest.py
===================================================================
--- development/scons/scons_manifest.py (Revision 14998)
+++ development/scons/scons_manifest.py (Arbeitskopie)
@@ -1650,6 +1650,7 @@ lib_images_math_files = Split('''
heartsuit.xpm
hookleftarrow.xpm
hookrightarrow.xpm
+ hphantom.xpm
hslash.xpm
imath.xpm
in.xpm
@@ -1797,6 +1798,7 @@ lib_images_math_files = Split('''
parallel.xpm
partial.xpm
perp.xpm
+ phantom.xpm
phi.xpm
phi2.xpm
pi.xpm
@@ -1943,6 +1945,7 @@ lib_images_math_files = Split('''
vec.xpm
vee.xpm
veebar.xpm
+ vphantom.xpm
wedge.xpm
widehat.xpm
widetilde.xpm