r14898 by jghali - fix incorrect text to path conversion when smallcaps effect is used on à character
scribus-commit
scribus-commit at lists.scribus.net
Tue Mar 16 21:50:37 CET 2010
Revision: 14898
Author: jghali
Date: 2010-03-16T20:46:28.070517Z
Commit message: fix incorrect text to path conversion when smallcaps effect is used on à character
Changeset:
M /trunk/Scribus/scribus/scribusview.cpp
Diffs:
Index: scribus/scribusview.cpp
===================================================================
--- scribus/scribusview.cpp (revision 14897)
+++ scribus/scribusview.cpp (revision 14898)
@@ -3583,14 +3583,14 @@
double chs = charStyle.fontSize();
if (hl->effects() & ScStyle_SmallCaps)
{
- if (chstr.toUpper() != chstr)
+ if (chstr[0].toUpper() != chstr[0])
{
chs = qMax(static_cast<int>(hl->fontSize() * Doc->typographicSettings.valueSmallCaps / 100), 1);
- chstr = chstr.toUpper();
+ chstr = chstr[0].toUpper();
}
}
else if (hl->effects() & ScStyle_AllCaps)
- chstr = chstr.toUpper();
+ chstr = chstr[0].toUpper();
// double csi = static_cast<double>(chs) / 100.0;
uint chr = chstr[0].unicode();
QPointF tangt = QPointF( cos(hl->PRot), sin(hl->PRot) );
@@ -3877,14 +3877,14 @@
double chs = charStyle.fontSize();
if (hl->effects() & ScStyle_SmallCaps)
{
- if (chstr.toUpper() != chstr)
+ if (chstr[0].toUpper() != chstr[0])
{
chs = qMax(static_cast<int>(hl->fontSize() * Doc->typographicSettings.valueSmallCaps / 100), 1);
- chstr = chstr.toUpper();
+ chstr = chstr[0].toUpper();
}
}
else if (hl->effects() & ScStyle_AllCaps)
- chstr = chstr.toUpper();
+ chstr = chstr[0].toUpper();
double csi = static_cast<double>(chs) / 100.0;
uint chr = chstr[0].unicode();
QTransform chma, chma2, chma3, chma4, chma6;
More information about the scribus-commit
mailing list