Subversion Repositories Scribus

Compare Revisions

Ignore whitespace Rev 9651 → Rev 9652

/branches/Version135x/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format_save.cpp
885,7 → 885,9
int lastPos = from;
for (int i = from; i < to; ++i)
{
if (itemText.charStyle(i).effects() & ScStyle_HyphenationPossible)
if (itemText.charStyle(i).effects() & ScStyle_HyphenationPossible
// duplicate SHYPHEN if already present to indicate a user provided SHYPHEN:
|| itemText.text(i) == SpecialChars::SHYPHEN)
{
result += itemText.text(lastPos, i + 1 - lastPos);
result += SpecialChars::SHYPHEN;
/branches/Version135x/Scribus/scribus/plugins/fileloader/scribus134format/scribus134format.cpp
1791,7 → 1791,16
{
// qDebug(QString("scribus134format: SHYPHEN at %1").arg(pos));
ScText* lastItem = obj->itemText.item(pos-1);
lastItem->setEffects(lastItem->effects() | ScStyle_HyphenationPossible);
// double SHY means user provided SHY, single SHY is automatic one
if (lastItem->effects() & ScStyle_HyphenationPossible)
{
lastItem->setEffects(lastItem->effects() & ~ScStyle_HyphenationPossible);
obj->itemText.insertChars(pos, QString(ch));
}
else
{
lastItem->setEffects(lastItem->effects() | ScStyle_HyphenationPossible);
}
}
else {
obj->itemText.insertChars(pos, QString(ch));