← Back to branch summary

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

« back to all changes in this revision

Viewing changes to scribus/plugins/scriptplugin/cmdstyle.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/plugins/scriptplugin/cmdstyle.cpp
38
38
                        const_cast<char*>("charstyle"),
39
39
                        NULL};
40
40
        char *Name = const_cast<char*>(""), *CharStyle = const_cast<char*>("");
41
 
        int LineSpacingMode = 0, LineSpacing = 15, Alignment = 0, LeftMargin = 0, RightMargin = 0, GapBefore = 0, GapAfter = 0, FirstIndent = 0, DropCapLines = 2, DropCapOffset = 0, HasDropCap = 0;
42
 
        if (!PyArg_ParseTupleAndKeywords(args, keywords, "es|iiiiiiiiiiies",
 
41
        int LineSpacingMode = 0, Alignment = 0, DropCapLines = 2, HasDropCap = 0;
 
42
        double LineSpacing = 15.0, LeftMargin = 0.0, RightMargin = 0.0;
 
43
        double GapBefore = 0.0, GapAfter = 0.0, FirstIndent = 0.0, DropCapOffset = 0;
 
44
        if (!PyArg_ParseTupleAndKeywords(args, keywords, "es|ididddddiides",
43
45
                 keywordargs, "utf-8", &Name, &LineSpacingMode, &LineSpacing, &Alignment,
44
46
                &LeftMargin, &RightMargin, &GapBefore, &GapAfter, &FirstIndent,
45
47
                &HasDropCap, &DropCapLines, &DropCapOffset, "utf-8", &CharStyle))