← Back to branch summary

~ubuntu-branches/ubuntu/wily/scribus/wily-proposed

« back to all changes in this revision

Viewing changes to scribus/scpageoutput.cpp

  • Committer: Package Import Robot
  • Author(s): Oleksandr Moskalenko
  • Date: 2012-02-09 21:50:56 UTC
  • mfrom: (1.1.6)
  • Revision ID: package-import@ubuntu.com-20120209215056-2wrx1ara0jbm7fi5
Tags: 1.4.0.dfsg+r17287-1
http://bugs.debian.org/654703
http://bugs.debian.org/655885
http://bugs.debian.org/630751
* New upstream stable release upload into Debian (Closes: #654703).
* Applied the Ubuntu armel patch.
* Removed non-free color swatches from resources.
* debian/control:
  - Moved icc-profiles from Recommends to Suggests (Closes: #655885).
  - Updated Standards-Version to 3.9.2.
  - Updated extended description per lintian warning.
* debian/rules:
  - Update mailcap (Closes: #630751). A request for mime.types update has
    been sent to the mime-support maintainer.
  - Added build-arch and build-indep targets per lintian warning.
* debian/patches:
  - top_cmakelists.patch - don't copy extra docs and changelogs.
  - scribus_cmakelists.patch - don't copy extra docs and changelogs.
  - scribus_cmakelists.patch - don't install the non-free "doc" dir.
  - profiles_cmakelists.patch - don't install non-free sRGB profile.
* debian/copyright: 
  - Converted to the DEP5 machine readable foramt.
  - Added licenses for free color swatches.

Show diffs side-by-side

added added

removed removed

Lines of Context:
scribus/scpageoutput.cpp
1073
1073
                hl->glyph.yadvance = 0;
1074
1074
                item->layoutGlyphs(itemText.charStyle(a), chstr, hl->glyph);
1075
1075
                hl->glyph.shrink();
1076
 
                if (hl->ch == SpecialChars::OBJECT)
 
1076
                if (hl->hasObject())
1077
1077
                        totalTextLen += (hl->embedded.getItem()->gWidth + hl->embedded.getItem()->lineWidth()) * hl->glyph.scaleH;
1078
1078
                else
1079
1079
                        totalTextLen += hl->glyph.wide()+hl->fontSize() * hl->tracking() / 10000.0;
1113
1113
                hl->glyph.yadvance = 0;
1114
1114
                item->layoutGlyphs(itemText.charStyle(a), chstr, hl->glyph);
1115
1115
                hl->glyph.shrink();                                                           // HACK
1116
 
                if (hl->ch == SpecialChars::OBJECT)
 
1116
                if (hl->hasObject())
1117
1117
                        dx = (hl->embedded.getItem()->gWidth + hl->embedded.getItem()->lineWidth()) * hl->glyph.scaleH / 2.0;
1118
1118
                else
1119
1119
                        dx = hl->glyph.wide() / 2.0;
1190
1190
                painter->setWorldMatrix(savWM);
1191
1191
                painter->restore();
1192
1192
                CurX -= dx;
1193
 
                if (hl->ch == SpecialChars::OBJECT)
 
1193
                if (hl->hasObject())
1194
1194
                        CurX += (hl->embedded.getItem()->gWidth + hl->embedded.getItem()->lineWidth()) * hl->glyph.scaleH;
1195
1195
                else
1196
1196
                        CurX += hl->glyph.wide()+hl->fontSize() * hl->tracking() / 10000.0 + extraOffset;
1423
1423
                                                        drawGlyphs(item, painter, charStyle, hl->glyph, clip);
1424
1424
                                                painter->restore();
1425
1425
                                        }
1426
 
                                        if (hl->ch == SpecialChars::OBJECT)
 
1426
                                        if (hl->hasObject())
1427
1427
                                                CurX += (hl->embedded.getItem()->gWidth + hl->embedded.getItem()->lineWidth());
1428
1428
                                        else
1429
1429
                                                CurX += hl->glyph.wide();