Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 2303 → Rev 2304

/branches/Version13x/Scribus/scribus/pageitem.cpp
690,6 → 690,13
p->setPen(tmp, 1, SolidLine, FlatCap, MiterJoin);
}
chs = hl->csize;
if (hl->cstyle & 2048)
{
if (Doc->docParagraphStyles[hl->cab].BaseAdj)
chs = qRound(10 * ((Doc->typographicSetttings.valueBaseGrid * (Doc->docParagraphStyles[hl->cab].DropLin-1)+(hl->cfont->numAscent * (hl->csize / 10.0))) / (RealCHeight(Doc, hl->cfont, chx, 10))));
else
chs = qRound(10 * ((Doc->docParagraphStyles[hl->cab].LineSpa * (Doc->docParagraphStyles[hl->cab].DropLin-1)+(hl->cfont->numAscent * (hl->csize / 10.0))) / (RealCHeight(Doc, hl->cfont, chx, 10))));
}
oldCurY = SetZeichAttr(hl, &chs, &chx);
if ((chx == QChar(9)) && (tTabValues.count() != 0) && (tabCc < tTabValues.count()) && (!tTabValues[tabCc].tabFillChar.isNull()))
{
1027,6 → 1034,7
DropLines = Doc->docParagraphStyles[absa].DropLin;
}
}
hl->cstyle &= 0xF7FF; // 2047;
if (((Doc->docParagraphStyles[absa].textAlignment == 3) || (Doc->docParagraphStyles[absa].textAlignment == 4)) && (LiList.count() == 0) && (hl->ch == " "))
{
hl->cstyle |= 4096;
1033,7 → 1041,7
continue;
}
else
hl->cstyle &= 4095;
hl->cstyle &= 0xEFFF; // 4095;
if (LiList.count() == 0)
{
if (((a > 0) && (itemText.at(a-1)->ch == QChar(13))) || ((a == 0) && (BackBox == 0)))
1057,15 → 1065,16
{
if (Doc->docParagraphStyles[hl->cab].BaseAdj)
{
chsd = qRound(10 * ((Doc->typographicSetttings.valueBaseGrid * DropLines) / (RealCHeight(Doc, hl->cfont, chx, 10))));
chs = qRound(10 * ((Doc->typographicSetttings.valueBaseGrid * DropLines) / RealCAscent(Doc, hl->cfont, chx, 10)));
chsd = qRound(10 * ((Doc->typographicSetttings.valueBaseGrid * (DropLines-1)+(hl->cfont->numAscent * (hl->csize / 10.0))) / (RealCHeight(Doc, hl->cfont, chx, 10))));
chs = qRound(10 * ((Doc->typographicSetttings.valueBaseGrid * (DropLines-1)+(hl->cfont->numAscent * (hl->csize / 10.0))) / RealCAscent(Doc, hl->cfont, chx, 10)));
}
else
{
chsd = qRound(10 * ((Doc->docParagraphStyles[absa].LineSpa * DropLines) / (RealCHeight(Doc, hl->cfont, chx, 10))));
chs = qRound(10 * ((Doc->docParagraphStyles[absa].LineSpa * DropLines) / RealCAscent(Doc, hl->cfont, chx, 10)));
chsd = qRound(10 * ((Doc->docParagraphStyles[absa].LineSpa * (DropLines-1)+(hl->cfont->numAscent * (hl->csize / 10.0))) / (RealCHeight(Doc, hl->cfont, chx, 10))));
chs = qRound(10 * ((Doc->docParagraphStyles[absa].LineSpa * (DropLines-1)+(hl->cfont->numAscent * (hl->csize / 10.0))) / RealCAscent(Doc, hl->cfont, chx, 10)));
}
hl->csize = chsd;
hl->cstyle |= 2048;
// hl->csize = chsd;
}
else
chs = hl->csize;
/branches/Version13x/Scribus/scribus/libpostscript/pslib.cpp
40,6 → 40,7
extern void Level2Layer(ScribusDoc *doc, struct Layer *ll, int Level);
extern uint getDouble(QString in, bool raw);
extern double Cwidth(ScribusDoc *doc, Foi* name, QString ch, int Siz, QString ch2 = " ");
extern double RealCHeight(ScribusDoc *currentDoc, Foi* name, QString ch, int Size);
extern bool loadText(QString nam, QString *Buffer);
extern QString CompressStr(QString *in);
extern char *toHex( uchar u );
2370,8 → 2371,15
double wideR;
QValueList<double> dum;
dum.clear();
chx = hl->ch;
tsz = hl->csize;
chx = hl->ch;
if (hl->cstyle & 2048)
{
if (Doc->docParagraphStyles[hl->cab].BaseAdj)
tsz = qRound(10 * ((Doc->typographicSetttings.valueBaseGrid * (Doc->docParagraphStyles[hl->cab].DropLin-1)+(hl->cfont->numAscent * (hl->csize / 10.0))) / (RealCHeight(Doc, hl->cfont, chx, 10))));
else
tsz = qRound(10 * ((Doc->docParagraphStyles[hl->cab].LineSpa * (Doc->docParagraphStyles[hl->cab].DropLin-1)+(hl->cfont->numAscent * (hl->csize / 10.0))) / (RealCHeight(Doc, hl->cfont, chx, 10))));
}
if (hl->ch == QChar(29))
chx = " ";
if (hl->ch == QChar(0xA0))
/branches/Version13x/Scribus/scribus/libpdf/pdflib.cpp
58,6 → 58,7
extern char *toHex( uchar u );
extern QString String2Hex(QString *in, bool lang = true);
extern double Cwidth(ScribusDoc *doc, Foi* name, QString ch, int Siz, QString ch2 = " ");
extern double RealCHeight(ScribusDoc *currentDoc, Foi* name, QString ch, int Size);
extern FPoint getMaxClipF(FPointArray* Clip);
extern FPoint getMinClipF(FPointArray* Clip);
#ifdef HAVE_CMS
2718,6 → 2719,13
}
int tsz = hl->csize;
QString chx = hl->ch;
if (hl->cstyle & 2048)
{
if (doc->docParagraphStyles[hl->cab].BaseAdj)
tsz = qRound(10 * ((doc->typographicSetttings.valueBaseGrid * (doc->docParagraphStyles[hl->cab].DropLin-1)+(hl->cfont->numAscent * (hl->csize / 10.0))) / (RealCHeight(doc, hl->cfont, chx, 10))));
else
tsz = qRound(10 * ((doc->docParagraphStyles[hl->cab].LineSpa * (doc->docParagraphStyles[hl->cab].DropLin-1)+(hl->cfont->numAscent * (hl->csize / 10.0))) / (RealCHeight(doc, hl->cfont, chx, 10))));
}
if (hl->ch == QChar(29))
chx = " ";
if (hl->ch == QChar(0xA0))