Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 157 → Rev 158

/trunk/Scribus/ChangeLogCVS
1,4 → 1,6
Changes since Version 1.1.4
13.01.2004 Fixed Cursor Placement Issues.
 
12.01.2004 Fixed Bug with Sub/Superscript.
Fixed Crash when copying Pages.
 
/trunk/Scribus/scribus/pageitem.cpp
714,6 → 714,7
CurX++;
if (CurX+RExtra+lineCorr > ColBound.y())
{
fBorder = false;
if (a == 0)
CurY++;
else
763,17 → 764,17
CurX += Extra+lineCorr;
fBorder = false;
}
if ((hl->ch == ".") && (TabCode == 2))
if ((hl->ch == ".") && (TabCode == 2) && (RTab))
{
RTab = false;
TabCode = 0;
}
if ((hl->ch == ",") && (TabCode == 3))
if ((hl->ch == ",") && (TabCode == 3) && (RTab))
{
RTab = false;
TabCode = 0;
}
if ((hl->ch == QChar(9)) && (TabCode == 4))
if ((hl->ch == QChar(9)) && (TabCode == 4) && (RTab))
{
RTab = false;
TabCode = 0;
828,7 → 829,7
}
else
hl->xp = CurX;
if (TabCode == 4)
if ((TabCode == 4) && (RTab))
CurX += (wide+hl->cextra) / 2;
pt1 = QPoint(static_cast<int>(CurX+RExtra+lineCorr), static_cast<int>(CurY+desc+BExtra+lineCorr));
pt2 = QPoint(static_cast<int>(CurX+RExtra+lineCorr), static_cast<int>(CurY-asce));
/trunk/Scribus/scribus/libabout/about.cpp
54,7 → 54,7
tabLayout1->addWidget( PixmapLabel1 );
BuildID = new QLabel( tab, "BB" );
BuildID->setAlignment(Qt::AlignCenter);
QString bu = tr("%1. %2 %3 ").arg(12).arg("January").arg(2004);
QString bu = tr("%1. %2 %3 ").arg(13).arg("January").arg(2004);
#ifdef HAVE_CMS
bu += "C";
#else
/trunk/Scribus/scribus/scribus.cpp
1326,8 → 1326,10
hg->cstyle = doc->CurrentStyle;
hg->cab = doc->CurrentABStil;
if (doc->Vorlagen[doc->CurrentABStil].Font != "")
{
hg->cfont = doc->Vorlagen[doc->CurrentABStil].Font;
hg->csize = doc->Vorlagen[doc->CurrentABStil].FontSize;
hg->csize = doc->Vorlagen[doc->CurrentABStil].FontSize;
}
hg->cextra = 0;
hg->xp = 0;
hg->yp = 0;
1389,8 → 1391,10
hg->cstyle = doc->CurrentStyle;
hg->cab = doc->CurrentABStil;
if (doc->Vorlagen[doc->CurrentABStil].Font != "")
{
hg->cfont = doc->Vorlagen[doc->CurrentABStil].Font;
hg->csize = doc->Vorlagen[doc->CurrentABStil].FontSize;
hg->csize = doc->Vorlagen[doc->CurrentABStil].FontSize;
}
hg->xp = 0;
hg->yp = 0;
hg->PRot = 0;
4671,10 → 4675,10
if (doc->Vorlagen[ite->Ptext.at(e)->cab].Font != "")
{
ite->Ptext.at(e)->cfont = doc->Vorlagen[ite->Ptext.at(e)->cab].Font;
ite->Ptext.at(e)->csize = ite->ISize;
ite->Ptext.at(e)->csize = doc->Vorlagen[ite->Ptext.at(e)->cab].FontSize;
}
else
ite->Ptext.at(e)->csize = doc->Vorlagen[ite->Ptext.at(e)->cab].FontSize;
ite->Ptext.at(e)->csize = ite->ISize;
}
}
}
4693,10 → 4697,10
if (doc->Vorlagen[ite->Ptext.at(e)->cab].Font != "")
{
ite->Ptext.at(e)->cfont = doc->Vorlagen[ite->Ptext.at(e)->cab].Font;
ite->Ptext.at(e)->csize = ite->ISize;
ite->Ptext.at(e)->csize = doc->Vorlagen[ite->Ptext.at(e)->cab].FontSize;
}
else
ite->Ptext.at(e)->csize = doc->Vorlagen[ite->Ptext.at(e)->cab].FontSize;
ite->Ptext.at(e)->csize = ite->ISize;
}
}
}
/trunk/Scribus/scribus/plugins/scriptplugin/cmdmisc.cpp
197,6 → 197,8
{
QValueList<Layer>::iterator it2 = doc->Layers.at(lam);
int num2 = (*it2).LNr;
if (!num2)
return Py_None;
int num = (*it2).Level;
doc->Layers.remove(it2);
QValueList<Layer>::iterator it;
205,10 → 207,8
it = doc->Layers.at(l);
if ((*it).Level > num)
(*it).Level -= 1;
if ((*it).LNr > num2)
(*it).LNr -= 1;
}
Carrier->LayerRemove(lam);
Carrier->LayerRemove(num2);
doc->ActiveLayer = 0;
Carrier->changeLayer(0);
break;
227,7 → 227,7
return Py_None;
QString tmp;
struct Layer ll;
ll.LNr = doc->Layers.count();
ll.LNr = doc->Layers.last().LNr + 1;
ll.Level = doc->Layers.count();
ll.Name = QString(Name);
ll.Sichtbar = true;
/trunk/Scribus/scribus/page.cpp
4812,7 → 4812,7
void Page::slotDoCurs(bool draw)
{
QColor tmp;
int chs;
int chs, offs;
PageItem *b;
if (GetItem(&b))
{
4828,21 → 4828,30
{
if (b->Ptext.at(b->CPos-1)->yp == 0)
return;
chx = b->Ptext.at(b->CPos-1)->ch;
offs = b->CPos-1;
chx = b->Ptext.at(offs)->ch;
if (chx == QChar(30))
chx = b->ExpandToken(b->CPos-1);
chx = b->ExpandToken(offs);
if (chx == QChar(29))
chx = " ";
chs = b->Ptext.at(b->CPos-1)->csize;
b->SetZeichAttr(b->Ptext.at(b->CPos-1), &chs, &chx);
xp = static_cast<int>(b->Ptext.at(b->CPos-1)->xp);
if ((b->Ptext.at(b->CPos-1)->ch == QChar(13)) && (b->CPos != static_cast<int>(b->Ptext.count())))
xp = static_cast<int>(b->Ptext.at(b->CPos)->xp);
if ((b->Ptext.at(b->CPos-1)->ch != QChar(13)) && (b->Ptext.at(b->CPos-1)->ch != QChar(9)))
xp += qRound(Cwidth(doku, b->Ptext.at(b->CPos-1)->cfont, chx, chs)*(b->Ptext.at(b->CPos-1)->cscale / 100.0));
yp = static_cast<int>(b->Ptext.at(b->CPos-1)->yp);
desc = static_cast<int>((*doku->AllFonts)[b->Ptext.at(b->CPos-1)->cfont]->numDescender * (-b->Ptext.at(b->CPos-1)->csize / 10.0));
asce = static_cast<int>((*doku->AllFonts)[b->Ptext.at(b->CPos-1)->cfont]->numAscent * (b->Ptext.at(b->CPos-1)->csize / 10.0));
chs = b->Ptext.at(offs)->csize;
b->SetZeichAttr(b->Ptext.at(offs), &chs, &chx);
xp = static_cast<int>(b->Ptext.at(offs)->xp);
if ((b->Ptext.at(offs)->ch == QChar(13)) && (b->CPos != static_cast<int>(b->Ptext.count())))
xp = static_cast<int>(b->Ptext.at(offs+1)->xp);
if ((b->Ptext.at(offs)->ch != QChar(13)) && (b->Ptext.at(offs)->ch != QChar(9)))
xp += qRound(Cwidth(doku, b->Ptext.at(offs)->cfont, chx, chs)*(b->Ptext.at(offs)->cscale / 100.0));
if (b->CPos != static_cast<int>(b->Ptext.count()))
{
if (b->Ptext.at(offs)->yp != b->Ptext.at(offs+1)->yp)
{
offs++;
xp = static_cast<int>(b->Ptext.at(offs)->xp);
}
}
yp = static_cast<int>(b->Ptext.at(offs)->yp);
desc = static_cast<int>((*doku->AllFonts)[b->Ptext.at(offs)->cfont]->numDescender * (-b->Ptext.at(offs)->csize / 10.0));
asce = static_cast<int>((*doku->AllFonts)[b->Ptext.at(offs)->cfont]->numAscent * (b->Ptext.at(offs)->csize / 10.0));
}
else
{
6000,10 → 6009,10
if (doku->Vorlagen[s].Font != "")
{
nb->Ptext.at(a)->cfont = doku->Vorlagen[s].Font;
nb->Ptext.at(a)->csize = nb->ISize;
nb->Ptext.at(a)->csize = doku->Vorlagen[s].FontSize;
}
else
nb->Ptext.at(a)->csize = doku->Vorlagen[s].FontSize;
nb->Ptext.at(a)->csize = nb->ISize;
a--;
}
if (cr)
6026,10 → 6035,10
if (doku->Vorlagen[s].Font != "")
{
nb->Ptext.at(a)->cfont = doku->Vorlagen[s].Font;
nb->Ptext.at(a)->csize = nb->ISize;
nb->Ptext.at(a)->csize = doku->Vorlagen[s].FontSize;
}
else
nb->Ptext.at(a)->csize = doku->Vorlagen[s].FontSize;
nb->Ptext.at(a)->csize = nb->ISize;
if (nb->Ptext.at(a)->ch == QChar(13))
{
cr = false;
6055,10 → 6064,10
if (doku->Vorlagen[s].Font != "")
{
b->Ptext.at(a)->cfont = doku->Vorlagen[s].Font;
b->Ptext.at(a)->csize = b->ISize;
b->Ptext.at(a)->csize = doku->Vorlagen[s].FontSize;
}
else
b->Ptext.at(a)->csize = doku->Vorlagen[s].FontSize;
b->Ptext.at(a)->csize = b->ISize;
}
}
}