support for missing \negmedspace and \negthickspace
Herbert
--
http://www.lyx.org/help/
Index: lib/symbols
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/symbols,v
retrieving revision 1.25
diff -u -r1.25 symbols
--- lib/symbols 14 Aug 2002 11:05:21 -0000 1.25
+++ lib/symbols 14 Aug 2002 15:33:02 -0000
@@ -89,12 +89,14 @@
# spaces
lyxnegspace space none
lyxposspace space none
-qquad space none
-quad space none
+! space none
+negmedspace space none
+negthickspace space none
, space none
: space none
; space none
-! space none
+quad space none
+qquad space none
# styles
displaystyle style 0
Index: src/mathed/math_spaceinset.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/math_spaceinset.C,v
retrieving revision 1.36
diff -u -r1.36 math_spaceinset.C
--- src/mathed/math_spaceinset.C 14 Aug 2002 15:13:07 -0000 1.36
+++ src/mathed/math_spaceinset.C 14 Aug 2002 15:33:24 -0000
@@ -7,15 +7,16 @@
#include "LColor.h"
#include "frontends/Painter.h"
#include "math_mathmlstream.h"
-
+#include "debug.h"
char const * latex_mathspace[] = {
- "!", ",", ":", ";", "quad", "qquad", "lyxnegspace", "lyxposspace"
+ "!", "negmedspace", "negthickspace", // negative space
+ ",", ":", ";", "quad", "qquad", // positive space
+ "lyxnegspace", "lyxposspace" // LyX special
};
-
-
+int const nSpace = sizeof(latex_mathspace)/sizeof(char *);
MathSpaceInset::MathSpaceInset(int sp)
: space_(sp)
@@ -25,7 +26,7 @@
MathSpaceInset::MathSpaceInset(string const & name)
: space_(1)
{
- for (int i = 0; i < 8; ++i)
+ for (int i = 0; i < nSpace; ++i)
if (latex_mathspace[i] == name)
space_ = i;
}
@@ -41,15 +42,17 @@
void MathSpaceInset::metrics(MathMetricsInfo &) const
{
switch (space_) {
- case 0: dim_.w = 6; break;
- case 1: dim_.w = 6; break;
- case 2: dim_.w = 8; break;
- case 3: dim_.w = 10; break;
- case 4: dim_.w = 20; break;
- case 5: dim_.w = 40; break;
- case 6: dim_.w = -2; break;
- case 7: dim_.w = 2; break;
- default: dim_.w = 6; break;
+ case 0:
+ case 3: dim_.w = 6; break;
+ case 1:
+ case 4: dim_.w = 8; break;
+ case 2:
+ case 5: dim_.w = 10; break;
+ case 6: dim_.w = 20; break;
+ case 7: dim_.w = 40; break;
+ case 8: dim_.w = -2; break;
+ case 9: dim_.w = 2; break;
+ default: dim_.w = 6;
}
dim_.a = 4;
dim_.d = 0;
@@ -61,24 +64,24 @@
// Sadly, HP-UX CC can't handle that kind of initialization.
// XPoint p[4] = {{++x, y-3}, {x, y}, {x+width-2, y}, {x+width-2, y-3}};
- if (space_ >= 6)
+ if (space_ >= nSpace - 2)
return;
int xp[4];
int yp[4];
xp[0] = ++x; yp[0] = y - 3;
- xp[1] = x; yp[1] = y;
+ xp[1] = x; yp[1] = y;
xp[2] = x + width() - 2; yp[2] = y;
xp[3] = x + width() - 2; yp[3] = y - 3;
- pain.pain.lines(xp, yp, 4, space_ ? LColor::latex : LColor::math);
+ pain.pain.lines(xp, yp, 4, (space_ < 3) ? LColor::latex : LColor::math);
}
void MathSpaceInset::incSpace()
{
- space_ = (space_ + 1) % 6;
+ space_ = (space_ + 1) % (nSpace - 2);
}
@@ -107,6 +110,6 @@
void MathSpaceInset::write(WriteStream & os) const
{
- if (space_ >= 0 && space_ < 8)
+ if (space_ >= 0 && space_ < nSpace)
os << '\\' << latex_mathspace[space_] << ' ';
}
