*
* Dependencies: Xlib, XForms
*
- * Copyright: (c) 1996, Alejandro Aguilar Sierra
+ * Copyright: 1996, Alejandro Aguilar Sierra
*
* Version: 0.8beta.
*
#include "support/lstrings.h"
#include "debug.h"
+using std::endl;
+
const int SizeInset = sizeof(char*) + 2;
const int SizeFont = 2;
// the builtin memcpy() is broken in egcs and gcc 2.95.x on alpha
// stations. We provide a hand-made version instead.
-inline void my_memcpy( void* ps_in, const void* pt_in, unsigned int n )
+inline
+void my_memcpy( void * ps_in, const void * pt_in, size_t n )
{
- char* ps = static_cast<char*>(ps_in);
- char* pt = static_cast<char*>(const_cast<void*>(pt_in));
- for( int i = 0; i < n; i++)
- *ps++ = *pt++;
+ char * ps = static_cast<char *>(ps_in);
+ char const * pt = static_cast<char const *>(pt_in);
+ /*
+ for(size_t i = n; i--;)
+ *ps++ = *pt++;
+ */
+ while (n--) *ps++ = *pt++;
}
void MathedIter::Reset()
{
- if (array->last>0 && MathIsFont(array->bf[0])) {
+ if (array->last > 0 && MathIsFont(array->bf[0])) {
fcode = array->bf[0];
pos = 1;
} else {
// An active math inset MUST be derived from MathParInset because it
// must have at least one paragraph to edit
-MathParInset* MathedIter::GetActiveInset()
+MathParInset * MathedIter::GetActiveInset()
{
if (IsActive()) {
- return (MathParInset*)GetInset();
+ return static_cast<MathParInset*>(GetInset());
}
lyxerr << "Math Error: This is not an active inset" << endl;
{
// lyxerr << "Ne[" << pos << "]";
if (!OK()) return false;
- int w= 0;
+ int w = 0;
// lyxerr << "xt ";
if (IsInset()) {
- MathedInset* px = GetInset();
+ MathedInset * px = GetInset();
w = px->Width();
if (px->GetType() == LM_OT_SCRIPT) {
- if (w>sw) sw = w;
+ if (w > sw) sw = w;
w = 0;
} else
- sx = (px->GetLimits()) ? w: 0;
+ sx = (px->GetLimits()) ? w : 0;
} else {
byte c = GetChar();
- if (c>= ' ') {
+ if (c >= ' ') {
// lyxerr << "WD[" << fcode << " " << size << " " << c << endl;
w = mathed_char_width(fcode, size, c);
} else
if (c == LM_TC_TAB && p) {
// w = p->GetTab(col+1);
- w = (crow) ? crow->getTab(col+1): 0;
+ w = (crow) ? crow->getTab(col + 1) : 0;
//lyxerr << "WW[" << w << "]";
} else
if (c == LM_TC_CR && p) {
// lyxerr <<"LNX " << pos << endl;
// if (sw>0 && GetChar()!= LM_TC_UP && GetChar()!= LM_TC_DOWN) {
// w = (sx>sw) ? 0: sw-sx;
- if ((sw>0 || sx>0) && GetChar()!= LM_TC_UP && GetChar()!= LM_TC_DOWN) {
- if (sw>0)
- w = (sx>sw) ? 0: sw-sx;
+ if ((sw > 0 || sx > 0) && GetChar() != LM_TC_UP && GetChar() != LM_TC_DOWN) {
+ if (sw > 0)
+ w = (sx > sw) ? 0 : sw - sx;
sx = sw = 0;
}
x += w;