Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 2260 → Rev 2261

/branches/Version13x/Scribus/scribus/pageitem.cpp
2542,20 → 2542,18
}
else
{
if (hl->Farb != "None")
if ((hl->Style & 256) && (hl->Farb2 != "None"))
{
if ((hl->Style & 256) && (hl->Farb2 != "None"))
{
p->save();
p->translate((hl->Siz * hl->shadowX / 10000.0) * p->zoomFactor(), -(hl->Siz * hl->shadowY / 10000.0) * p->zoomFactor());
QColor tmp = p->brush();
p->setBrush(p->pen());
p->fillPath();
p->setBrush(tmp);
p->restore();
}
p->save();
p->translate((hl->Siz * hl->shadowX / 10000.0) * p->zoomFactor(), -(hl->Siz * hl->shadowY / 10000.0) * p->zoomFactor());
QColor tmp = p->brush();
p->setBrush(p->pen());
p->fillPath();
p->setBrush(tmp);
p->restore();
}
if (hl->Farb != "None")
p->fillPath();
if ((hl->Style & 4) && (hl->Farb2 != "None") && ((hl->Siz * hl->outline / 10000.0) != 0))
{
p->setLineWidth(hl->Siz * hl->outline / 10000.0);
/branches/Version13x/Scribus/scribus/libpostscript/pslib.cpp
2172,17 → 2172,12
else
{
PS_selectfont(hl->cfont->SCName, tsz / 10.0);
if (hl->ccolor != "None")
{
SetFarbe(Doc, hl->ccolor, hl->cshade, &h, &s, &v, &k, gcr);
PS_setcmykcolor_stroke(h / 255.0, s / 255.0, v / 255.0, k / 255.0);
}
PS_save();
PS_translate(hl->xp, -hl->yp);
if (ite->Reverse)
{
int chs = hl->csize;
ite->SetZeichAttr(hl, &chs, &chx);
PS_translate(hl->xp, -hl->yp);
PS_scale(-1, 1);
if (d < ite->MaxChars-1)
{
2199,23 → 2194,17
wideR = -Cwidth(Doc, hl->cfont, chx, chs) * (hl->cscale / 1000.0);
PS_translate(wideR, 0);
}
if (hl->cbase != 0)
PS_translate(0, (hl->csize / 10.0) * (hl->cbase / 1000.0));
if (hl->cscale != 1000)
PS_scale(hl->cscale / 1000.0, 1);
if (hl->cscalev != 1000)
PS_scale(1, hl->cscalev / 1000.0);
PS_show_xyG(hl->cfont->SCName, chx, 0, 0);
}
else
if (hl->cbase != 0)
PS_translate(0, (hl->csize / 10.0) * (hl->cbase / 1000.0));
if (hl->cscale != 1000)
PS_scale(hl->cscale / 1000.0, 1);
if (hl->cscalev != 1000)
PS_scale(1, hl->cscalev / 1000.0);
if (hl->ccolor != "None")
{
PS_translate(hl->xp, -hl->yp);
if (hl->cbase != 0)
PS_translate(0, (hl->csize / 10.0) * (hl->cbase / 1000.0));
if (hl->cscale != 1000)
PS_scale(hl->cscale / 1000.0, 1);
if (hl->cscalev != 1000)
PS_scale(1, hl->cscalev / 1000.0);
SetFarbe(Doc, hl->ccolor, hl->cshade, &h, &s, &v, &k, gcr);
PS_setcmykcolor_stroke(h / 255.0, s / 255.0, v / 255.0, k / 255.0);
PS_show_xyG(hl->cfont->SCName, chx, 0, 0);
}
PS_restore();
/branches/Version13x/Scribus/scribus/libpdf/pdflib.cpp
2767,7 → 2767,8
if (hl->cscalev != 1000)
tmp2 += "1 0 0 1 0 "+FToStr( (((tsz / 10.0) - (tsz / 10.0) * (hl->cscalev / 1000.0)) / (tsz / 10.0)) * -1)+" cm\n";
tmp2 += FToStr(QMIN(QMAX(hl->cscale, 100), 4000) / 1000.0)+" 0 0 "+FToStr(QMIN(QMAX(hl->cscalev, 100), 4000) / 1000.0)+" 0 0 cm\n";
tmp2 += "/"+hl->cfont->RealName().replace( QRegExp("\\s"), "" )+IToStr(chr)+" Do\n";
if (hl->ccolor != "None")
tmp2 += "/"+hl->cfont->RealName().replace( QRegExp("\\s"), "" )+IToStr(chr)+" Do\n";
if (hl->cstyle & 4)
{
FPointArray gly = hl->cfont->GlyphArray[chr].Outlines.copy();