[scribus-dev] Scribus CTL

[Craig Bradney]

> On 24 Feb 2016, at 17:54, Craig Bradney <cbradney at scribus.info> wrote:
> 
> 
>> On 24 Feb 2016, at 17:53, Khaled Hosny <khaledhosny at eglug.org> wrote:
>> 
>> On Tue, Feb 23, 2016 at 10:30:20PM +0100, Craig Bradney wrote:
>>> 
>>>> I just rebased on top of r21027, and we will try to rebase regularly to
>>>> keep things in sync. I have been also trying to reduce the unneeded
>>>> diffs as much as possible (reverting early experimentation etc.) to make
>>>> the final patch a bit easier to digest.
>>>> 
>>> 
>>> r20128 and r20129 are easy for you to bring over. scpaths.h/cpp and
>>> ui/helpbrowser.cpp.
>> 
>> We are on r21029 now. Rebasing with git is super easy as long as we
>> didn’t touch the same code (and even that can be manageable to a certain
>> degree).
>> 
>>> I was trying to do a rename of ScPainter to ScImagePainter to match
>>> you but you still have both classes at the moment. Not sure which to
>>> use.
>> 
>> After the latest changes most of the renaming became unnecessary, so I
>> reverted most of the ScPainter changes so the differences are reduced
>> quite a bit and more localised now.
>> 
> 
> I just removed the extra ; in scpage.h so that is now the same too.
> 
> I’m now seeing 34 files with changes and 2 orphans (the 2 new boxes files in the text directory)
> 

There looks to be only minimal comment related changes to frect.h/.cpp and fsize.h/.cpp in the text dir too. Also same for rc4.c .

I’ve added the extra FPoint constructor in r21033 too.

Craig