Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 7911 → Rev 7912

/branches/Version13x/Scribus/scribus/pageitem_pathtext.cpp
64,7 → 64,7
{
int a;
int chs;
double wide;
// double wide;
QString chstr, chstr2, chstr3;
ScText *hl;
double dx;
81,6 → 81,7
uint seg = 0;
double segLen = 0;
double distCurX;
QColor tmp;
CurX = Extra;
if (!m_Doc->layerOutline(LayerNr))
{
98,7 → 99,6
else
{
multiLine ml = m_Doc->MLineStyles[NamedLStyle];
QColor tmp;
for (int it = ml.size()-1; it > -1; it--)
{
if ((ml[it].Color != CommonStrings::None) && (ml[it].Width != 0))
124,9 → 124,12
if ((chstr == QChar(30)) || (chstr == QChar(13)) || (chstr == QChar(9)) || (chstr == QChar(28)))
continue;
chs = hl->fontSize();
if (a < itemText.length()-1)
chstr += itemText.text(a+1, 1);
layoutGlyphs(itemText.charStyle(a), chstr, hl->glyph);
hl->glyph.more = false;
// SetZeichAttr(*hl, &chs, &chstr); //FIXME: layoutGlyphs
if (chstr == QChar(29))
/* if (chstr == QChar(29))
chstr2 = " ";
else if (chstr == QChar(24))
chstr2 = "-";
145,7 → 148,8
else
wide = hl->font().charWidth(chstr2[0], chs);
wide = wide * (hl->scaleH() / 1000.0);
dx = wide / 2.0;
dx = wide / 2.0; */
dx = hl->glyph.wide() / 2.0;
CurX += dx;
ext = false;
while ( (seg < PoLine.size()-3) && (CurX > fsx + segLen))
199,13 → 203,18
else
break;
}
hl->glyph.xoffset = point.x();
hl->glyph.yoffset = point.y();
hl->glyph.xoffset = 0;
hl->glyph.yoffset = BaseOffs;
hl->PtransX = tangent.x();
hl->PtransY = tangent.y();
hl->PRot = dx;
#ifdef HAVE_CAIRO
QWMatrix trafo = QWMatrix( 1, 0, 0, -1, -dx, 0 );
trafo *= QWMatrix( tangent.x(), tangent.y(), tangent.y(), -tangent.x(), point.x(), point.y() );
#else
QWMatrix trafo = QWMatrix( 1, 0, 0, -1, -dx*sc, 0 );
trafo *= QWMatrix( tangent.x(), tangent.y(), tangent.y(), -tangent.x(), point.x()*sc, point.y()*sc );
#endif
QWMatrix sca = p->worldMatrix();
trafo *= sca;
p->save();
212,7 → 221,21
QWMatrix savWM = p->worldMatrix();
p->setWorldMatrix(trafo);
if (!m_Doc->RePos)
{
if (itemText.charStyle(a).fillColor() != CommonStrings::None)
{
SetFarbe(&tmp, itemText.charStyle(a).fillColor(), itemText.charStyle(a).fillShade());
p->setBrush(tmp);
}
if (itemText.charStyle(a).strokeColor() != CommonStrings::None)
{
SetFarbe(&tmp, itemText.charStyle(a).strokeColor(), itemText.charStyle(a).strokeShade());
p->setPen(tmp, 1, SolidLine, FlatCap, MiterJoin);
}
drawGlyphs(p, itemText.charStyle(a), hl->glyph);
}
hl->glyph.xoffset = point.x();
hl->glyph.yoffset = point.y();
/* Zli = new ZZ;
Zli->Zeich = chstr;
if (hl->fillColor() != CommonStrings::None)
262,7 → 285,8
MaxChars = a+1;
oCurX = CurX;
CurX -= dx;
CurX += wide+hl->fontSize() * hl->tracking() / 10000.0;
CurX += hl->glyph.wide()+hl->fontSize() * hl->tracking() / 10000.0;
// CurX += wide+hl->fontSize() * hl->tracking() / 10000.0;
first = false;
}
#endif
/branches/Version13x/Scribus/scribus/scribusview.cpp
11272,8 → 11272,8
sca.rotate(currItem->rotation());
trafo *= sca;
}
chma.scale(csi, csi);
chma2.scale(hl->scaleH() / 1000.0, hl->scaleV() / 1000.0);
// chma.scale(csi, csi);
chma.scale(hl->glyph.scaleH * charStyle.fontSize() / 100.00, hl->glyph.scaleV * charStyle.fontSize() / 100.0);
if (currItem->reversed())
{
if (a < currItem->itemText.length()-1)
11282,14 → 11282,16
wide = hl->font().charWidth(chstr[0], hl->fontSize());
chma3.scale(-1, 1);
chma3.translate(-wide, 0);
chma4.translate(0, currItem->BaseOffs-((hl->fontSize() / 10.0) * (hl->scaleV() / 1000.0)));
// chma4.translate(0, currItem->BaseOffs-((hl->fontSize() / 10.0) * (hl->scaleV() / 1000.0)));
}
else
chma4.translate(0, currItem->BaseOffs-((hl->fontSize() / 10.0) * (hl->scaleV() / 1000.0)));
// else
chma4.translate(0, currItem->BaseOffs - (charStyle.fontSize() / 10.0) * (charStyle.baselineOffset() / 1000.0));
// chma4.translate(0, currItem->BaseOffs-((hl->fontSize() / 10.0) * (hl->scaleV() / 1000.0)));
if (hl->baselineOffset() != 0)
chma6.translate(0, -(hl->fontSize() / 10.0) * (hl->baselineOffset() / 1000.0));
uint gl = currItem->itemText.charStyle(a).font().char2CMap(chr);
pts = currItem->itemText.charStyle(a).font().glyphOutline(gl);
chma6.translate(0, (-charStyle.fontSize() / 10.0) * (charStyle.baselineOffset() / 1000.0));
// chma6.translate(0, -(hl->fontSize() / 10.0) * (hl->baselineOffset() / 1000.0));
uint gl = hl->font().char2CMap(chr);
pts = hl->font().glyphOutline(gl);
if (pts.size() < 4)
continue;
pts.map(chma * chma2 * chma3 * chma4 * chma6);