Merge branch 'master' of github.com:cappuccino/cappuccino

AppKit/AppKit.j

@@ -101,6 +101,7 @@
 @import "CPTabView.j"
 @import "CPText.j"
 @import "CPTextField.j"
+@import "CPTextView.j"
 @import "CPTokenField.j"
 @import "CPToolbar.j"
 @import "CPToolbarItem.j"

AppKit/CPColor.j

@@ -100,8 +100,10 @@ var cachedBlackColor,
 + (CPDictionary)themeAttributes
 {
     return @{
-            @"alternate-selected-control-color": [CPNull null],
-            @"secondary-selected-control-color" : [CPNull null]
+            @"alternate-selected-control-color":        [CPNull null],
+            @"secondary-selected-control-color":        [CPNull null],
+            @"selected-text-background-color":          [CPNull null],
+            @"selected-text-inactive-background-color": [CPNull null]
         };
 }
 
@@ -498,6 +500,16 @@ var cachedBlackColor,
     return [[CPColor alloc] _initWithCSSString: aString];
 }
 
++ (CPColor)selectedTextBackgroundColor
+{
+    return [[self _cachedThemeColor] valueForThemeAttribute:@"selected-text-background-color"] || [CPColor colorWithHexString:"99CCFF"];
+}
+
++ (CPColor)_selectedTextBackgroundColorUnfocussed
+{
+    return [[self _cachedThemeColor] valueForThemeAttribute:@"selected-text-inactive-background-color"] || [CPColor colorWithHexString:"CCCCCC"];
+}
+
 /* @ignore */
 - (id)_initWithCSSString:(CPString)aString
 {

AppKit/CPCompatibility.j

@@ -26,11 +26,12 @@
 
 // Browser Engines
 CPUnknownBrowserEngine                  = 0;
-CPGeckoBrowserEngine                    = 1;
-CPInternetExplorerBrowserEngine         = 2;
-CPKHTMLBrowserEngine                    = 3;
-CPOperaBrowserEngine                    = 4;
-CPWebKitBrowserEngine                   = 5;
+CPGeckoBrowserEngine                    = 1 << 0;
+CPInternetExplorerBrowserEngine         = 1 << 1;
+CPKHTMLBrowserEngine                    = 1 << 2;
+CPOperaBrowserEngine                    = 1 << 3;
+CPWebKitBrowserEngine                   = 1 << 4;  // Safari + Chrome
+CPBlinkBrowserEngine                    = 1 << 5;  // Recent Chrome
 
 // Operating Systems
 CPMacOperatingSystem                    = 0;
@@ -84,14 +85,23 @@ CPAltEnterTextAreaFeature               = 32;
 
 /*
     When an absolutely positioned div (CPView) with an absolutely positioned canvas in it (CPView with drawRect:) moves things on top of the canvas (subviews) don't redraw correctly. E.g. if you have a bunch of text fields in a CPBox in a sheet which animates in, some of the text fields might not be visible because the CPBox has a canvas at the bottom and the box moved form offscreen to onscreen. This bug is probably very related: https://bugs.webkit.org/show_bug.cgi?id=67203
-*/
+ */
 CPCanvasParentDrawErrorsOnMovementBug   = 1 << 0;
 
 // The paste event is only sent if an input or textarea has focus.
-CPJavaScriptPasteRequiresEditableTarget   = 1 << 1;
+CPJavaScriptPasteRequiresEditableTarget = 1 << 1;
 // Redirecting the focus of the browser on keydown to an input for Cmd-V or Ctrl-V makes the paste fail.
 CPJavaScriptPasteCantRefocus            = 1 << 2;
 
+/*
+   Safari calculates incorrect text size unless you set the canvas font even if it is already set
+       You can see the bug after disabling the workaround and opening any panel while typing.
+       You can use the font panel in the manual test for CPTextView.
+       Look out for a displaced cursor, i.e. after typing letters of small width, such as the 'i'.
+       https://bugs.webkit.org/show_bug.cgi?id=150224
+ */
+CPTextSizingAlwaysNeedsSetFontBug       = 1 << 3;
+
 
 var USER_AGENT                          = "",
     PLATFORM_ENGINE                     = CPUnknownBrowserEngine,
@@ -110,7 +120,7 @@ if (typeof window !== "undefined" && typeof window.navigator !== "undefined")
 // Opera
 if (typeof window !== "undefined" && window.opera)
 {
-    PLATFORM_ENGINE = CPOperaBrowserEngine;
+    PLATFORM_ENGINE |= CPOperaBrowserEngine;
 
     PLATFORM_FEATURES[CPJavaScriptCanvasDrawFeature] = YES;
 }
@@ -118,7 +128,7 @@ if (typeof window !== "undefined" && window.opera)
 // Internet Explorer
 else if (typeof window !== "undefined" && (window.attachEvent || (!(window.ActiveXObject) && "ActiveXObject" in window))) // Must follow Opera check.
 {
-    PLATFORM_ENGINE = CPInternetExplorerBrowserEngine;
+    PLATFORM_ENGINE |= CPInternetExplorerBrowserEngine;
 
     // Features we can only be sure of with IE (no known independent tests)
     PLATFORM_FEATURES[CPVMLFeature] = YES;
@@ -136,10 +146,10 @@ else if (typeof window !== "undefined" && (window.attachEvent || (!(window.Activ
     PLATFORM_FEATURES[CPJavaScriptClipboardAccessFeature] = YES;
 }
 
-// WebKit
+// Safari + Chrome (WebKit and Blink)
 else if (USER_AGENT.indexOf("AppleWebKit/") != -1)
 {
-    PLATFORM_ENGINE = CPWebKitBrowserEngine;
+    PLATFORM_ENGINE |= CPWebKitBrowserEngine;
 
     // Features we can only be sure of with WebKit (no known independent tests)
     PLATFORM_FEATURES[CPCSSRGBAFeature] = YES;
@@ -179,7 +189,10 @@ else if (USER_AGENT.indexOf("AppleWebKit/") != -1)
         PLATFORM_BUGS |= CPJavaScriptPasteRequiresEditableTarget;
         // https://bugs.webkit.org/show_bug.cgi?id=39689
         PLATFORM_BUGS |= CPJavaScriptPasteCantRefocus;
+        PLATFORM_BUGS |= CPTextSizingAlwaysNeedsSetFontBug;
     }
+    else if ((window.chrome || (window.Intl && Intl.v8BreakIterator)) && 'CSS' in window)
+        PLATFORM_ENGINE |= CPBlinkBrowserEngine;
 
     // Assume this bug was introduced around Safari 5.1/Chrome 16. This could probably be tighter.
     if (majorVersion > 533)
@@ -189,13 +202,13 @@ else if (USER_AGENT.indexOf("AppleWebKit/") != -1)
 // KHTML
 else if (USER_AGENT.indexOf("KHTML") != -1) // Must follow WebKit check.
 {
-    PLATFORM_ENGINE = CPKHTMLBrowserEngine;
+    PLATFORM_ENGINE |= CPKHTMLBrowserEngine;
 }
 
 // Gecko
 else if (USER_AGENT.indexOf("Gecko") !== -1) // Must follow KHTML check.
 {
-    PLATFORM_ENGINE = CPGeckoBrowserEngine;
+    PLATFORM_ENGINE |= CPGeckoBrowserEngine;
 
     PLATFORM_FEATURES[CPJavaScriptCanvasDrawFeature] = YES;
 
@@ -286,7 +299,7 @@ function CPPlatformHasBug(aBug)
 
 function CPBrowserIsEngine(anEngine)
 {
-    return PLATFORM_ENGINE === anEngine;
+    return PLATFORM_ENGINE & anEngine;
 }
 
 function CPBrowserIsOperatingSystem(anOperatingSystem)

AppKit/CPControl.j

@@ -25,7 +25,7 @@
 
 @import "CPFont.j"
 @import "CPShadow.j"
-@import "CPView.j"
+@import "CPText.j"
 @import "CPKeyValueBinding.j"
 @import "CPTrackingArea.j"
 
@@ -169,7 +169,7 @@ var CPControlBlackColor = [CPColor blackColor];
 }
 
 /*!
-    Reverse set the binding iff the CPContinuouslyUpdatesValueBindingOption is set.
+    Reverse set the binding if the CPContinuouslyUpdatesValueBindingOption is set.
 */
 - (void)_continuouslyReverseSetBinding
 {

AppKit/CPEvent.j

@@ -28,7 +28,6 @@
 
 @import "CPCompatibility.j"
 @import "CGGeometry.j"
-@import "CPText.j"
 @import "CPTrackingArea.j"
 
 @class CPTextField
@@ -36,6 +35,9 @@
 @class CPGraphicsContext
 
 @global CPApp
+@global CPNewlineCharacter
+@global CPCarriageReturnCharacter
+@global CPEnterCharacter
 
 @typedef DOMEvent
 @typedef CPEventType

AppKit/CPFont.j

@@ -24,6 +24,7 @@
 @import <Foundation/CPBundle.j>
 
 @import "CPView.j"
+@import "CPFontDescriptor.j"
 
 CPFontDefaultSystemFontFace = @"Arial, sans-serif";
 CPFontDefaultSystemFontSize = 12;
@@ -433,6 +434,43 @@ following:
 
 @end
 
+@implementation CPFont(DescriptorAdditions)
+
+- (id)_initWithFontDescriptor:(CPFontDescriptor)fontDescriptor
+{
+    var aName = [fontDescriptor objectForKey: CPFontNameAttribute] ,
+        aSize = [fontDescriptor pointSize],
+        isBold = [fontDescriptor symbolicTraits] & CPFontBoldTrait,
+        isItalic = [fontDescriptor symbolicTraits] & CPFontItalicTrait;
+
+    return [self _initWithName:aName size:aSize bold:isBold italic:isItalic system:NO];
+}
+
++ (CPFont)fontWithDescriptor:(CPFontDescriptor)fontDescriptor size:(float)aSize
+{
+    var aName = [fontDescriptor objectForKey: CPFontNameAttribute],
+        isBold = [fontDescriptor symbolicTraits] & CPFontBoldTrait,
+        isItalic = [fontDescriptor symbolicTraits] & CPFontItalicTrait;
+
+    return [self _fontWithName:aName size:aSize || [fontDescriptor pointSize] bold:isBold italic:isItalic];
+}
+
+- (CPFontDescriptor)fontDescriptor
+{
+    var traits = 0;
+
+    if ([self isBold])
+        traits |= CPFontBoldTrait;
+
+    if ([self isItalic])
+        traits |= CPFontItalicTrait;
+
+    return [[CPFontDescriptor fontDescriptorWithName:_name size:_size] fontDescriptorWithSymbolicTraits:traits];
+}
+
+@end
+
+
 var CPFontNameKey     = @"CPFontNameKey",
     CPFontSizeKey     = @"CPFontSizeKey",
     CPFontIsBoldKey   = @"CPFontIsBoldKey",

AppKit/CPFontManager.j

@@ -22,9 +22,12 @@
 
 @import <Foundation/CPObject.j>
 
+@import "CPControl.j"
 @import "CPFont.j"
+@import "CPFontDescriptor.j"
 
 @global CPApp
+@class CPFontPanel
 
 CPItalicFontMask                    = 1 << 0;
 CPBoldFontMask                      = 1 << 1;
@@ -41,7 +44,20 @@ CPUnitalicFontMask                  = 1 << 24;
 
 
 var CPSharedFontManager     = nil,
-    CPFontManagerFactory    = Nil;
+    CPFontManagerFactory    = nil,
+    CPFontPanelFactory      = nil;
+
+/*
+    modifyFont: sender's tag
+*/
+CPNoFontChangeAction    = 0;
+CPViaPanelFontAction    = 1;
+CPAddTraitFontAction    = 2;
+CPSizeUpFontAction      = 3;
+CPSizeDownFontAction    = 4;
+CPHeavierFontAction     = 5;
+CPLighterFontAction     = 6;
+CPRemoveTraitFontAction = 7;
 
 /*!
     @ingroup appkit
@@ -59,6 +75,8 @@ var CPSharedFontManager     = nil,
     BOOL            _multiple @accessors(getter=isMultiple, setter=setMultiple:);
 
     CPDictionary    _activeChange;
+
+    unsigned        _fontAction;
 }
 
 // Getting the Shared Font Manager
@@ -83,6 +101,15 @@ var CPSharedFontManager     = nil,
 {
     CPFontManagerFactory = aClass;
 }
+/*!
+    Sets the class that will be used to create the application's
+    Font panel.
+*/
++ (void)setFontPanelFactory:(Class)aClass
+{
+    CPFontPanelFactory = aClass;
+}
+
 
 - (id)init
 {
@@ -210,6 +237,7 @@ var CPSharedFontManager     = nil,
 {
     var tag = [sender tag];
     _activeChange = tag === nil ? @{} : @{ @"addTraits": tag };
+    _fontAction = CPAddTraitFontAction;
 
     [self sendAction];
 }
@@ -219,6 +247,185 @@ var CPSharedFontManager     = nil,
     return [CPApp sendAction:_action to:_target from:self];
 }
 
+
+/*!
+    This method open the font panel, create it if necessary.
+    @param sender The object that sent the message.
+*/
+- (CPFontPanel)fontPanel:(BOOL)createIt
+{
+    var panel = nil,
+        panelExists = [CPFontPanelFactory sharedFontPanelExists];
+
+    if ((panelExists) || (!panelExists && createIt))
+        panel = [CPFontPanelFactory sharedFontPanel];
+
+    return panel;
+}
+
+/*!
+    Convert a font to have the specified Font traits. The font is unchanged expect for the specified Font traits.
+    Using CPUnboldFontMask or CPUnitalicFontMask will respectively remove Bold and Italic traits.
+    @param aFont The font to convert.
+    @param fontTrait The new font traits mask.
+    @result The converted font or \c aFont if the conversion failed.
+*/
+- (CPFont)convertFont:(CPFont)aFont toHaveTrait:(CPFontTraitMask)fontTrait
+{
+    var attributes = [[[aFont fontDescriptor] fontAttributes] copy],
+        symbolicTrait = [[aFont fontDescriptor] symbolicTraits];
+
+    if (fontTrait & CPBoldFontMask)
+        symbolicTrait |= CPFontBoldTrait;
+
+    if (fontTrait & CPItalicFontMask)
+        symbolicTrait |= CPFontItalicTrait;
+
+    if (fontTrait & CPUnboldFontMask) /* FIXME: this only change CPFontSymbolicTrait what about CPFontWeightTrait */
+        symbolicTrait &= ~CPFontBoldTrait;
+
+    if (fontTrait & CPUnitalicFontMask)
+        symbolicTrait &= ~CPFontItalicTrait;
+
+    if (fontTrait & CPExpandedFontMask)
+        symbolicTrait |= CPFontExpandedTrait;
+
+    if (fontTrait & CPSmallCapsFontMask)
+        symbolicTrait |= CPFontSmallCapsTrait;
+
+    if (![attributes containsKey:CPFontTraitsAttribute])
+        [attributes setObject:[CPDictionary dictionaryWithObject:[CPNumber numberWithUnsignedInt:symbolicTrait]
+                                                          forKey:CPFontSymbolicTrait]
+                       forKey:CPFontTraitsAttribute];
+    else
+        [[attributes objectForKey:CPFontTraitsAttribute] setObject:[CPNumber numberWithUnsignedInt:symbolicTrait]
+                                                            forKey:CPFontSymbolicTrait];
+
+    return [[aFont class] fontWithDescriptor:[CPFontDescriptor fontDescriptorWithFontAttributes:attributes] size:0.0];
+}
+
+/*!
+    Convert a font to not have the specified Font traits. The font is unchanged expect for the specified Font traits.
+    @param aFont The font to convert.
+    @param fontTrait The font traits mask to remove.
+    @result The converted font or \c aFont if the conversion failed.
+*/
+- (CPFont)convertFont:(CPFont)aFont toNotHaveTrait:(CPFontTraitMask)fontTrait
+{
+    var attributes = [[[aFont fontDescriptor] fontAttributes] copy],
+        symbolicTrait = [[aFont fontDescriptor] symbolicTraits];
+
+    if ((fontTrait & CPBoldFontMask) || (fontTrait & CPUnboldFontMask)) /* FIXME: see convertFont:toHaveTrait: about CPFontWeightTrait */
+        symbolicTrait &= ~CPFontBoldTrait;
+
+    if ((fontTrait & CPItalicFontMask) || (fontTrait & CPUnitalicFontMask))
+        symbolicTrait &= ~CPFontItalicTrait;
+
+    if (fontTrait & CPExpandedFontMask)
+        symbolicTrait &= ~CPFontExpandedTrait;
+
+    if (fontTrait & CPSmallCapsFontMask)
+        symbolicTrait &= ~CPFontSmallCapsTrait;
+
+    if (![attributes containsKey:CPFontTraitsAttribute])
+        [attributes setObject:[CPDictionary dictionaryWithObject:[CPNumber numberWithUnsignedInt:symbolicTrait]
+                                                          forKey:CPFontSymbolicTrait]
+                       forKey:CPFontTraitsAttribute];
+    else
+        [[attributes objectForKey:CPFontTraitsAttribute] setObject:[CPNumber numberWithUnsignedInt:symbolicTrait]
+                                                            forKey:CPFontSymbolicTrait];
+
+    return [[aFont class] fontWithDescriptor:[CPFontDescriptor fontDescriptorWithFontAttributes:attributes] size:0.0];
+}
+
+/*!
+    Convert a font to have specified size. The font is unchanged expect for the specified size.
+    @param aFont The font to convert.
+    @param aSize The new font size.
+    @result The converted font or \c aFont if the conversion failed.
+*/
+- (CPFont)convertFont:(CPFont)aFont toSize:(float)aSize
+{
+    var descriptor = [aFont fontDescriptor];
+
+    return [[aFont class] fontWithDescriptor: descriptor size:aSize]
+}
+
+- (void)orderFrontFontPanel:(id)sender
+{
+    [[self fontPanel:YES] orderFront:sender];
+}
+
+- (void)modifyFont:(id)sender
+{
+    _fontAction = [sender tag];
+    [self sendAction];
+
+    if (_selectedFont)
+        [self setSelectedFont:[self convertFont:_selectedFont] isMultiple:NO];
+}
+
+/*!
+    This method causes the receiver to send its action message.
+    @param sender The object that sent the message. (a Font panel)
+*/
+- (void)modifyFontViaPanel:(id)sender
+{
+    _fontAction = CPViaPanelFontAction;
+    if (_selectedFont)
+        [self setSelectedFont:[self convertFont:_selectedFont] isMultiple:NO];
+
+    [self sendAction];
+}
+
+/*!
+    Convert a font according to current font changes, provided by the object that initiated the font change.
+    @param aFont The font to convert.
+    @result The converted font or \c aFont if the conversion failed.
+*/
+- (CPFont)convertFont:(CPFont)aFont
+{
+    var newFont = nil;
+    switch (_fontAction)
+    {
+        case CPNoFontChangeAction:
+            newFont = aFont;
+            break;
+
+        case CPViaPanelFontAction:
+            newFont = [[self fontPanel:NO] panelConvertFont:aFont];
+            break;
+
+        case CPAddTraitFontAction:
+            newFont = aFont;
+            if (!_activeChange)
+                break;
+
+            var addTraits = [_activeChange valueForKey:@"addTraits"];
+
+            if (addTraits)
+                newFont = [self convertFont:aFont toHaveTrait:addTraits];
+            break;
+
+        case CPSizeUpFontAction:
+            newFont = [self convertFont:aFont toSize:[aFont size] + 1.0]; /* any limit ? */
+            break;
+
+        case CPSizeDownFontAction:
+            if ([aFont size] > 1)
+                newFont = [self convertFont:aFont toSize:[aFont size] - 1.0];
+            /* else CPBeep() :-p */
+            break;
+
+        default:
+            CPLog.trace(@"-[" + [self className] + " " + _cmd + "] unsupported font action: " + _fontAction + " aFont unchanged");
+            newFont = aFont;
+            break;
+    }
+
+    return newFont;
+}
+
 @end
 
 var _CPFontDetectSpan,

AppKit/CPPasteboard.j

@@ -44,6 +44,7 @@ CPStringPboardType      = @"CPStringPboardType";
 CPURLPboardType         = @"CPURLPboardType";
 CPImagesPboardType      = @"CPImagesPboardType";
 CPVideosPboardType      = @"CPVideosPboardType";
+CPRTFPboardType         = @"CPRTFPboardType";
 
 UTF8PboardType          = @"public.utf8-plain-text";
 

AppKit/CPStringDrawing.j

@@ -24,9 +24,13 @@
 
 @import "CGGeometry.j"
 @import "CPPlatformString.j"
+@import "CPFont.j"
+@import "CPCompatibility.j"
 
 
-var CPStringSizeWithFontInWidthCache = {};
+var CPStringSizeWithFontInWidthCache = [],
+    CPStringSizeWithFontHeightCache = [],
+    CPStringSizeMeasuringContext;
 
 CPStringSizeCachingEnabled = YES;
 
@@ -53,20 +57,57 @@ CPStringSizeCachingEnabled = YES;
     return [self sizeWithFont:aFont inWidth:NULL];
 }
 
++ (void) initialize
+{
+    if ([self class] != [CPString class])
+        return;
+
+#if PLATFORM(DOM)
+    if (CPFeatureIsCompatible(CPHTMLCanvasFeature) && !CPStringSizeMeasuringContext)
+        CPStringSizeMeasuringContext = CGBitmapGraphicsContextCreate();
+#endif
+}
+
 - (CGSize)sizeWithFont:(CPFont)aFont inWidth:(float)aWidth
 {
+    var size;
+
+#if PLATFORM(DOM)
     if (!CPStringSizeCachingEnabled)
         return [CPPlatformString sizeOfString:self withFont:aFont forWidth:aWidth];
 
-    var cacheKey = self + [aFont cssString] + aWidth,
-        size = CPStringSizeWithFontInWidthCache[cacheKey];
+    var sizeCacheForFont = CPStringSizeWithFontInWidthCache[self];
 
-    if (size === undefined)
-    {
+    if (sizeCacheForFont === undefined)
+        sizeCacheForFont = CPStringSizeWithFontInWidthCache[self] = [];
+
+    var cssString = [aFont cssString],
+        cacheKey = cssString + '_' + aWidth;
+
+    size = sizeCacheForFont[cacheKey];
+
+    if (size !== undefined && sizeCacheForFont.hasOwnProperty(cacheKey))
+        return CGSizeMakeCopy(size);
+
+    if (!CPFeatureIsCompatible(CPHTMLCanvasFeature) || aWidth > 0)
         size = [CPPlatformString sizeOfString:self withFont:aFont forWidth:aWidth];
-        CPStringSizeWithFontInWidthCache[cacheKey] = size;
+    else
+    {
+        if (CPPlatformHasBug(CPTextSizingAlwaysNeedsSetFontBug) || CPStringSizeMeasuringContext.font !== cssString)
+            CPStringSizeMeasuringContext.font = cssString;
+
+        var fontHeight = CPStringSizeWithFontHeightCache[cssString];
+
+        if (fontHeight === undefined)
+            fontHeight = CPStringSizeWithFontHeightCache[cssString] = [aFont defaultLineHeightForFont];
+
+        size = CGSizeMake(CPStringSizeMeasuringContext.measureText(self).width, fontHeight);
     }
 
+    sizeCacheForFont[cacheKey] = size;
+#else
+        size = CGSizeMake(0, 0);
+#endif
     return CGSizeMakeCopy(size);
 }
 

AppKit/CPTabView.j

@@ -136,6 +136,8 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
 
 - (void)_insertTabViewItems:(CPArray)tabViewItems atIndexes:(CPIndexSet)indexes
 {
+    var prevItemsCount = [self numberOfTabViewItems];
+
     [_tabs insertSegments:tabViewItems atIndexes:indexes];
     [tabViewItems makeObjectsPerformSelector:@selector(_setTabView:) withObject:self];
 
@@ -143,6 +145,10 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
     [self _reverseSetContent];
 
     [self _sendDelegateTabViewDidChangeNumberOfTabViewItems];
+
+    // Do not allow empty selection if selection bindings are not enabled.
+    if (prevItemsCount == 0 && [self numberOfTabViewItems] > 0 && ![self _isSelectionBinded])
+        [self _selectTabViewItemAtIndex:0];
 }
 
 /*!
@@ -169,7 +175,7 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
 - (void)_didRemoveTabViewItem:(CPTabViewItem)aTabViewItem atIndex:(CPInteger)idx
 {
     // If the selection is managed by bindings, let the binder do that.
-    if ([self binderForBinding:CPSelectionIndexesBinding] || [self binderForBinding:CPSelectedIndexBinding])
+    if ([self _isSelectionBinded])
         return;
 
     if (_selectedTabViewItem == aTabViewItem)
@@ -335,13 +341,40 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
 
     [_tabs setSelectedSegment:anIndex];
     _selectedTabViewItem = aTabViewItem;
-    [self _displayItemView:[aTabViewItem view]];
+    [self _loadTabViewItem:aTabViewItem];
 
     [self _sendDelegateDidSelectTabViewItem:aTabViewItem];
 
     return YES;
 }
 
+- (void)_loadTabViewItem:(CPTabViewItem)aTabViewItem
+{
+    var controller = [aTabViewItem viewController];
+
+    if (controller !== nil && ![controller isViewLoaded])
+    {
+        [controller loadViewWithCompletionHandler:function(view, error)
+        {
+            if (error !== nil)
+            {
+                CPLog.warn("Could not load the view for item " + aTabViewItem + ". " + error);
+            }
+            else if (view !== nil)
+            {
+                [aTabViewItem setView:view];
+
+                if ([self selectedTabViewItem] == aTabViewItem)
+                    [self _displayItemView:view];
+            }
+        }];
+    }
+    else
+    {
+        [self _displayItemView:[aTabViewItem view]];
+    }
+}
+
 /*!
     Returns the current item being displayed.
     @return the tab view item currenly being displayed by the receiver
@@ -588,6 +621,11 @@ var CPTabViewDidSelectTabViewItemSelector           = 1 << 1,
     return [cls getBinding:aBinding forObject:self];
 }
 
+- (BOOL)_isSelectionBinded
+{
+    return [self binderForBinding:CPSelectionIndexesBinding] || [self binderForBinding:CPSelectedIndexBinding];
+}
+
 - (void)setItems:(CPArray)tabViewItems
 {
     if ([tabViewItems isEqualToArray:[_tabs segments]])
@@ -848,4 +886,4 @@ var CPTabViewItemsKey               = "CPTabViewItemsKey",
     return [super hitTest:aPoint];
 }
 
-@end
+@end

AppKit/CPTabViewItem.j

@@ -270,7 +270,7 @@ CPPressedTab    = 2;
         [self setLabel:title];
 
     if ([_tabView selectedTabViewItem] == self)
-        [_tabView _displayItemView:[_viewController view]];
+        [_tabView _loadTabViewItem:self];
 }
 
 @end

AppKit/CPTableView.j

@@ -5097,14 +5097,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
         }
     }
     else if (!_isViewBased && [aView isKindOfClass:[CPControl class]] && ![aView isKindOfClass:[CPTextField class]])
-    {
-        [self getColumn:@ref(column) row:@ref(row) forView:aView];
-
-        _editingColumn = column;
-        _editingRow = row;
-
         [aView addObserver:self forKeyPath:@"objectValue" options:CPKeyValueObservingOptionOld | CPKeyValueObservingOptionNew context:"editing"];
-    }
 
     return aView;
 }
@@ -5236,7 +5229,7 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
     if (!_isViewBased)
     {
         [self _setEditingState:NO forView:textField];
-        [self _commitDataViewObjectValue:textField];
+        [self _commitDataViewObjectValue:textField forColumn:_editingColumn andRow:_editingRow];
     }
     else
         [textField setBezeled:NO];
@@ -5286,19 +5279,19 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
     The action for any dataview that supports editing. This will only be called when the value was changed.
     The table view becomes the first responder after user is done editing a dataview.
 */
-- (void)_commitDataViewObjectValue:(id)aDataView
+- (void)_commitDataViewObjectValue:(id)aDataView forColumn:(CPInteger)column andRow:(CPInteger)row
 {
-    var editingTableColumn = _tableColumns[_editingColumn];
+    var editingTableColumn = _tableColumns[column];
 
     if (_implementedDataSourceMethods & CPTableViewDataSource_tableView_setObjectValue_forTableColumn_row_)
-        [_dataSource tableView:self setObjectValue:[aDataView objectValue] forTableColumn:editingTableColumn row:_editingRow];
+        [_dataSource tableView:self setObjectValue:[aDataView objectValue] forTableColumn:editingTableColumn row:row];
 
     // Allow the column binding to do a reverse set. Note that we do this even if the data source method above
     // is implemented.
-    [editingTableColumn _reverseSetDataView:aDataView forRow:_editingRow];
+    [editingTableColumn _reverseSetDataView:aDataView forRow:row];
 
-    if (_editingRow !== CPNotFound && _editingColumn !== CPNotFound)
-        [self reloadDataForRowIndexes:[CPIndexSet indexSetWithIndex:_editingRow] columnIndexes:[CPIndexSet indexSetWithIndex:_editingColumn]];
+    if (row !== CPNotFound && column !== CPNotFound)
+        [self _reloadDataForRowIndexes:[CPIndexSet indexSetWithIndex:row] columnIndexes:[CPIndexSet indexSetWithIndex:column]];
 }
 
 - (void)_setEditingState:(BOOL)editingState forView:(CPView)aView
@@ -5348,9 +5341,12 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
     if (context === "editing" && [object superview] === self)
     {
         [object removeObserver:self forKeyPath:keyPath];
-        [self _commitDataViewObjectValue:object];
-        _editingRow = CPNotFound;
-        _editingColumn = CPNotFound;
+
+        var row,
+            column;
+
+        [self getColumn:@ref(column) row:@ref(row) forView:object];
+        [self _commitDataViewObjectValue:object forColumn:column andRow:row];
     }
 }
 

AppKit/CPText.j

@@ -5,6 +5,13 @@
  * Created by Alexander Ljungberg.
  * Copyright 2010, WireLoad, LLC.
  *
+ * additions from
+ *
+ * Daniel Boehringer on 8/02/2014.
+ *  Copyright Daniel Boehringer on 8/02/2014.
+ *
+ *
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
@@ -20,6 +27,27 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
+@import <Foundation/Foundation.j>
+
+@import "CPPasteboard.j"
+@import "CPView.j"
+
+@global CPStringPboardType
+@class CPAttributedString
+@class _CPRTFParser
+
+@protocol CPTextDelegate <CPObject>
+
+- (BOOL)textShouldBeginEditing:(CPText)aTextObject;
+- (BOOL)textShouldEndEditing:(CPText)aTextObject;
+- (void)textDidBeginEditing:(CPNotification)aNotification;
+- (void)textDidChange:(CPNotification)aNotification;
+- (void)textDidEndEditing:(CPNotification)aNotification;
+
+@end
+
+CPParagraphSeparatorCharacter   = 0x2029;
+CPLineSeparatorCharacter        = 0x2028;
 CPEnterCharacter                = "\u0003";
 CPBackspaceCharacter            = "\u0008";
 CPTabCharacter                  = "\u0009";
@@ -29,6 +57,7 @@ CPCarriageReturnCharacter       = "\u000d";
 CPBackTabCharacter              = "\u0019";
 CPDeleteCharacter               = "\u007f";
 
+@typedef CPTextMovement
 CPIllegalTextMovement           = 0;
 CPOtherTextMovement             = 0;
 CPReturnTextMovement            = 16;
@@ -46,8 +75,274 @@ CPWritingDirectionLeftToRight   = 0;
 CPWritingDirectionRightToLeft   = 1;
 
 @typedef CPTextAlignment
-CPLeftTextAlignment      = 0;
-CPRightTextAlignment     = 1;
-CPCenterTextAlignment    = 2;
-CPJustifiedTextAlignment = 3;
-CPNaturalTextAlignment   = 4;
+CPLeftTextAlignment             = 0;
+CPRightTextAlignment            = 1;
+CPCenterTextAlignment           = 2;
+CPJustifiedTextAlignment        = 3;
+CPNaturalTextAlignment          = 4;
+
+/*
+    CPText notifications
+*/
+CPTextDidBeginEditingNotification = @"CPTextDidBeginEditingNotification";
+CPTextDidChangeNotification = @"CPTextDidChangeNotification";
+CPTextDidEndEditingNotification = @"CPTextDidEndEditingNotification";
+
+/*
+    CPTextView Notifications
+*/
+CPTextViewDidChangeSelectionNotification        = @"CPTextViewDidChangeSelectionNotification";
+CPTextViewDidChangeTypingAttributesNotification = @"CPTextViewDidChangeTypingAttributesNotification";
+
+/*
+    FIXME: move these to CPAttributed string
+    Make use of attributed keys in AppKit
+*/
+CPFontAttributeName = @"CPFontAttributeName";
+CPForegroundColorAttributeName = @"CPForegroundColorAttributeName";
+CPBackgroundColorAttributeName = @"CPBackgroundColorAttributeName";
+CPShadowAttributeName = @"CPShadowAttributeName";
+CPUnderlineStyleAttributeName = @"CPUnderlineStyleAttributeName";
+CPSuperscriptAttributeName = @"CPSuperscriptAttributeName";
+CPBaselineOffsetAttributeName = @"CPBaselineOffsetAttributeName";
+CPAttachmentAttributeName = @"CPAttachmentAttributeName";
+CPLigatureAttributeName = @"CPLigatureAttributeName";
+CPKernAttributeName = @"CPKernAttributeName";
+
+@implementation CPText : CPView
+{
+    BOOL       _isEditable       @accessors(getter=isEditable, setter=setEditable:);
+    BOOL       _isSelectable     @accessors(getter=isSelectable, setter=setSelectable:);
+    BOOL       _isRichText       @accessors(getter=isRichText, setter=setRichText:);
+}
+
+- (void)setSelectable:(BOOL)flag
+{
+    [self willChangeValueForKey:@"selectable"];
+    _isSelectable = flag;
+    [self didChangeValueForKey:@"selectable"];
+
+    if (!flag)
+        [self setEditable:flag];
+}
+
+- (void)setEditable:(BOOL)flag
+{
+    [self willChangeValueForKey:@"editable"];
+    _isEditable = flag;
+    [self didChangeValueForKey:@"editable"];
+
+    if (flag)
+        [self setSelectable:flag];
+}
+
+- (void)changeFont:(id)sender
+{
+    _CPRaiseInvalidAbstractInvocation(self, _cmd);
+}
+
+- (void)copy:(id)sender
+{
+    var selectedRange = [self selectedRange];
+
+    if (selectedRange.length < 1)
+            return;
+
+    var pasteboard = [CPPasteboard generalPasteboard];
+
+    // put plain representation on the pasteboad unconditionally
+    [pasteboard declareTypes:[CPStringPboardType] owner:nil];
+    [pasteboard setString:[[self stringValue] substringWithRange:selectedRange] forType:CPStringPboardType];
+}
+
+- (id)_stringForPasting
+{
+    var pasteboard = [CPPasteboard generalPasteboard],
+        dataForPasting = [pasteboard stringForType:CPRTFPboardType],
+        stringForPasting = [pasteboard stringForType:CPStringPboardType];
+
+    if (dataForPasting || [stringForPasting hasPrefix:"{\\rtf1\\ansi"])
+        stringForPasting = [[_CPRTFParser new] parseRTF:dataForPasting ? dataForPasting : stringForPasting];
+
+    if (![self isRichText] && [stringForPasting isKindOfClass:[CPAttributedString class]])
+        stringForPasting = stringForPasting._string;
+
+    return stringForPasting;
+}
+
+- (void)paste:(id)sender
+{
+    var stringForPasting = [self _stringForPasting];
+
+    if (stringForPasting)
+        [self insertText:stringForPasting];
+}
+
+- (void)copyFont:(id)sender
+{
+    _CPRaiseInvalidAbstractInvocation(self, _cmd);
+}
+
+- (void)delete:(id)sender
+{
+    _CPRaiseInvalidAbstractInvocation(self, _cmd);
+}
+
+- (CPFont)font:(CPFont)aFont
+{
+    _CPRaiseInvalidAbstractInvocation(self, _cmd);
+
+    return nil;
+}
+
+- (BOOL)isHorizontallyResizable
+{
+    _CPRaiseInvalidAbstractInvocation(self, _cmd);
+
+    return NO;
+}
+
+- (BOOL)isRulerVisible
+{
+    _CPRaiseInvalidAbstractInvocation(self, _cmd);
+
+    return NO;
+}
+
+- (BOOL)isVerticallyResizable
+{
+    _CPRaiseInvalidAbstractInvocation(self, _cmd);
+
+    return NO;
+}
+
+- (CGSize)maxSize
+{
+    _CPRaiseInvalidAbstractInvocation(self, _cmd);
+
+    return CGSizeMake(0,0);
+}
+
+- (CGSize)minSize
+{
+    _CPRaiseInvalidAbstractInvocation(self, _cmd);
+    return CGSizeMake(0,0);
+}
+
+- (void)pasteFont:(id)sender
+{
+    _CPRaiseInvalidAbstractInvocation(self, _cmd);
+}
+
+- (void)replaceCharactersInRange:(CPRange)aRange withString:(CPString)aString
+{
+    _CPRaiseInvalidAbstractInvocation(self, _cmd);
+}
+
+- (void)scrollRangeToVisible:(CPRange)aRange
+{
+    _CPRaiseInvalidAbstractInvocation(self, _cmd);
+}
+
+- (void)selectedAll:(id)sender
+{
+    _CPRaiseInvalidAbstractInvocation(self, _cmd);
+}
+
+- (CPRange)selectedRange
+{
+    _CPRaiseInvalidAbstractInvocation(self, _cmd);
+
+    return CPMakeRange(CPNotFound, 0);
+}
+
+- (void)setFont:(CPFont)aFont
+{
+    _CPRaiseInvalidAbstractInvocation(self, _cmd);
+}
+
+- (void)setFont:(CPFont)aFont range:(CPRange)aRange
+{
+    _CPRaiseInvalidAbstractInvocation(self, _cmd);
+}
+
+- (void)setHorizontallyResizable:(BOOL)flag
+{
+    _CPRaiseInvalidAbstractInvocation(self, _cmd);
+}
+
+- (void)setMaxSize:(CGSize)aSize
+{
+    _CPRaiseInvalidAbstractInvocation(self, _cmd);
+}
+
+- (void)setMinSize:(CGSize)aSize
+{
+    _CPRaiseInvalidAbstractInvocation(self, _cmd);
+}
+
+- (void)setString:(CPString)aString
+{
+    [self replaceCharactersInRange:CPMakeRange(0, [[self string] length]) withString:aString];
+}
+
+- (void)setUsesFontPanel:(BOOL)flag
+{
+    _CPRaiseInvalidAbstractInvocation(self, _cmd);
+}
+
+- (void)setVerticallyResizable:(BOOL)flag
+{
+    _CPRaiseInvalidAbstractInvocation(self, _cmd);
+}
+
+- (CPString)string
+{
+    _CPRaiseInvalidAbstractInvocation(self, _cmd);
+
+    return nil;
+}
+
+- (void)underline:(id)sender
+{
+    _CPRaiseInvalidAbstractInvocation(self, _cmd);
+}
+
+- (BOOL)usesFontPanel
+{
+    _CPRaiseInvalidAbstractInvocation(self, _cmd);
+
+    return NO;
+}
+
+@end
+
+var CPTextViewIsEditableKey = @"CPTextViewIsEditableKey",
+    CPTextViewIsSelectableKey = @"CPTextViewIsSelectableKey",
+    CPTextViewIsRichTextKey = @"CPTextViewIsRichTextKey";
+
+@implementation CPText (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super initWithCoder:aCoder];
+
+    if (self)
+    {
+        [self setSelectable:[aCoder decodeBoolForKey:CPTextViewIsSelectableKey]];
+        [self setEditable:[aCoder decodeBoolForKey:CPTextViewIsEditableKey]];
+        [self setRichText:[aCoder decodeBoolForKey:CPTextViewIsRichTextKey]];
+    }
+
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [super encodeWithCoder:aCoder];
+    [aCoder encodeBool:_isEditable forKey:CPTextViewIsEditableKey];
+    [aCoder encodeBool:_isSelectable forKey:CPTextViewIsSelectableKey];
+    [aCoder encodeBool:_isRichText forKey:CPTextViewIsRichTextKey];
+}
+
+@end

AppKit/CPTextView/CPFontDescriptor.j

@@ -0,0 +1,315 @@
+/*
+ * CPFontDescriptor.j
+ * AppKit
+ *
+ * Created by Emmanuel Maillard on 07/03/10.
+ * Copyright Emmanuel Maillard 2010.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPObject.j>
+/*
+    Font descriptor dictionary keys
+*/
+
+/*
+    CPFontNameAttribute contains a CPString that specified the font name
+    (may be an name list like: 'Marker Felt, Lucida Grande, Helvetica')
+*/
+CPFontNameAttribute = @"CPFontNameAttribute";
+/*
+    CPFontSizeAttribute contains a CPString that specified the font size
+    (as a float value)
+*/
+CPFontSizeAttribute = @"CPFontSizeAttribute";
+/*
+    CPFontTraitsAttribute a CPDictionary that contains font traits keys
+    (CPFontSymbolicTrait or CPFontWeightTrait)
+*/
+CPFontTraitsAttribute = @"CPFontTraitsAttribute";
+
+// Font traits dictionary keys
+/*
+    CPFontSymbolicTrait a CPNumber that contains CPFontFamilyClass and
+    typeface information flags.
+*/
+CPFontSymbolicTrait = @"CPFontSymbolicTrait";
+
+/*
+    CPFontWeightTrait
+    We use CPString with CSS string values for font weight
+    (normal | bold | bolder | lighter | 100 | 200 | 300 | 400
+    | 500 | 600 | 700 | 800 | 900)
+    NOTE: Cocoa compatibility issue: NSFontWeightTrait are NSNumber for
+    font weight (from -1.0 to 1.0, 0.0 for normal weight).
+*/
+CPFontWeightTrait = @"CPFontWeightTrait";
+
+/*
+    CPFontFamilyClass
+*/
+CPFontUnknownClass              = 0 << 28;
+CPFontOldStyleSerifsClass       = 1 << 28;
+CPFontTransitionalSerifsClass   = 2 << 28;
+CPFontModernSerifsClass         = 3 << 28;
+CPFontClarendonSerifsClass      = 4 << 28;
+CPFontSlabSerifsClass           = 5 << 28;
+CPFontFreeformSerifsClass       = 7 << 28;
+CPFontSansSerifClass            = 8 << 28;
+
+CPFontSerifClass = (CPFontOldStyleSerifsClass | CPFontTransitionalSerifsClass |
+                    CPFontModernSerifsClass | CPFontClarendonSerifsClass |
+                    CPFontSlabSerifsClass | CPFontFreeformSerifsClass);
+
+CPFontFamilyClassMask = 0xF0000000;
+
+/*
+    Typeface information
+*/
+CPFontItalicTrait       = 1 << 0;
+CPFontBoldTrait         = 1 << 1;
+CPFontExpandedTrait     = 1 << 5; /* TODO: CCS 3 font-stretch */
+CPFontCondensedTrait    = 1 << 6;
+CPFontSmallCapsTrait    = 1 << 7;
+
+/*!
+    @ingroup appkit
+    @class CPFontDescriptor
+*/
+@implementation CPFontDescriptor : CPObject
+{
+    CPDictionary _attributes;
+}
+
+/*!
+    Returns a font descriptor with the specified attributes.
+
+    @param attributes a dictionary that describe the desired font descriptor
+    @return the requested font descriptor
+*/
++ (CPFontDescriptor)fontDescriptorWithFontAttributes:(CPDictionary)attributes
+{
+    return [[CPFontDescriptor alloc] initWithFontAttributes:attributes];
+}
+
+/*!
+    Returns a font descriptor with the specified name and size.
+
+    @param fontName the name of the font
+    @param aSize the size of the font (in points)
+    @return the requested font descriptor
+*/
++ (CPFontDescriptor)fontDescriptorWithName:(CPString)fontName size:(float)size
+{
+    return [[CPFontDescriptor alloc] initWithFontAttributes:[CPDictionary dictionaryWithObjects:[fontName, [CPString stringWithString:size + '']] forKeys:[CPFontNameAttribute,CPFontSizeAttribute]]];
+}
+
+/*!
+    Initialize a font descriptor with the specified attributes.
+
+    @param attributes a dictionary that describe the desired font descriptor
+    @return the requested font descriptor
+*/
+- (id)initWithFontAttributes:(CPDictionary)attributes
+{
+    if (self = [super init])
+    {
+        _attributes = [[CPMutableDictionary alloc] init];
+
+        if (attributes)
+            [_attributes addEntriesFromDictionary:attributes];
+    }
+
+    return self;
+}
+
+/*!
+    Returns a new font descriptor that is the same as the receiver but with the
+    specified attributes taking precedence over the existing ones.
+
+    @param attributes a dictionary that describe the desired font descriptor
+    @return the new font descriptor
+*/
+- (CPFontDescriptor)fontDescriptorByAddingAttributes:(CPDictionary)attributes
+{
+    var attrib = [_attributes copy];
+
+    [attrib addEntriesFromDictionary:attributes];
+
+    return [[CPFontDescriptor alloc] initWithFontAttributes:attrib];
+}
+
+/*!
+    Returns a new font descriptor that is the same as the receiver but with the specified size taking precedence over the existing ones.
+
+    @param aSize the new size
+    @return the new font descriptor
+*/
+- (CPFontDescriptor)fontDescriptorWithSize:(float)aSize
+{
+    var attrib = [_attributes copy];
+
+    [attrib setObject:[CPString stringWithString:aSize + ''] forKey:CPFontSizeAttribute];
+
+    return [[CPFontDescriptor alloc] initWithFontAttributes:attrib];
+}
+
+/*!
+    Returns a new font descriptor that is the same as the receiver but with
+    the specified symbolic traits taking precedence over the existing ones.
+
+    @param symbolicTraits the desired new symbolic traits
+    @return the new font descriptor
+*/
+- (CPFontDescriptor)fontDescriptorWithSymbolicTraits:(CPFontSymbolicTraits)symbolicTraits
+{
+    var attrib = [_attributes copy];
+
+    if ([attrib objectForKey:CPFontTraitsAttribute])
+        [[attrib objectForKey:CPFontTraitsAttribute] setObject:[CPNumber numberWithUnsignedInt:symbolicTraits]
+                                                     forKey:CPFontSymbolicTrait];
+    else
+        [attrib setObject:[CPDictionary dictionaryWithObject:[CPNumber numberWithUnsignedInt:symbolicTraits]
+                forKey:CPFontSymbolicTrait] forKey:CPFontTraitsAttribute];
+
+    return [[CPFontDescriptor alloc] initWithFontAttributes:attrib];
+}
+
+- (id)objectForKey:(id)aKey
+{
+    return [_attributes objectForKey:aKey];
+}
+
+- (CPDictionary)fontAttributes
+{
+    return _attributes;
+}
+
+- (float)pointSize
+{
+    var value = [_attributes objectForKey:CPFontSizeAttribute];
+
+    return value ? [value floatValue] : 0.0;
+}
+
+- (CPFontSymbolicTraits)symbolicTraits
+{
+    var traits = [_attributes objectForKey:CPFontTraitsAttribute];
+
+    return (traits && [traits objectForKey:CPFontSymbolicTrait]) ? [[traits objectForKey:CPFontSymbolicTrait] unsignedIntValue] : 0;
+}
+
+@end
+
+var CPFontDescriptorAttributesKey = @"CPFontDescriptorAttributesKey";
+
+@implementation CPFontDescriptor (CPCoding)
+
+/*!
+    Initializes the font descriptor from a coder.
+
+    @param aCoder the coder from which to read the font descriptor data
+    @return the initialized font
+*/
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    return [self initWithFontAttributes:[aCoder decodeObjectForKey:CPFontDescriptorAttributesKey]];
+}
+
+/*!
+    Writes the font descriptor to a coder.
+
+    @param aCoder the coder to which the data will be written
+*/
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [aCoder encodeObject:_attributes forKey:CPFontDescriptorAttributesKey];
+}
+
+@end
+
+var _wrapNameRegEx = new RegExp(/(\w+\s+\w+)(,*)/g);
+
+/*
+    Helper methods to CPFont for generating CSS font style
+*/
+@implementation CPFontDescriptor (CPFontCSSHelper)
+
+- (CPString)fontStyleCSSString
+{
+    return [self symbolicTraits] & CPFontItalicTrait ? @"italic" : @"normal";
+}
+
+- (CPString)fontWeightCSSString
+{
+    var traitsAttributes = [_attributes objectForKey:CPFontTraitsAttribute];
+
+    if (traitsAttributes)
+    {
+        /* give preference to CPFontWeightTrait */
+        if ([traitsAttributes objectForKey:CPFontWeightTrait])
+            return [traitsAttributes objectForKey:CPFontWeightTrait];
+        /* else fallback to facetype symbolic traits */
+        if ([self symbolicTraits] & CPFontBoldTrait)
+            return @"bold";
+    }
+
+    return @"normal";
+}
+
+- (CPString)fontSizeCSSString
+{
+    return [_attributes objectForKey:CPFontSizeAttribute] ? [[_attributes objectForKey:CPFontSizeAttribute] intValue] + "px" : @"";
+}
+
+- (CPString)fontFamilyCSSString
+{
+    var aName = @"";
+
+    if ([_attributes objectForKey:CPFontNameAttribute])
+        aName += [_attributes objectForKey:CPFontNameAttribute].replace(_wrapNameRegEx, '"$1"$2');
+
+    var symbolicTraits = [self symbolicTraits];
+
+    if (symbolicTraits)
+    {
+        if ((symbolicTraits & CPFontFamilyClassMask) & CPFontSansSerifClass)
+            aName += @", sans-serif";
+        else if ((symbolicTraits & CPFontFamilyClassMask) & CPFontSerifClass)
+            aName += @", serif";
+    }
+
+    return aName;
+}
+
+- (CPString)fontVariantCSSString
+{
+    if ([self symbolicTraits] & CPFontSmallCapsTrait)
+        return @"small-caps";
+
+    return @"normal";
+}
+
+- (CPString)cssString
+{
+    return [CPString stringWithString:[self fontStyleCSSString] + " "
+                                + [self fontVariantCSSString] + " "
+                                + [self fontWeightCSSString] + " "
+                                + [self fontSizeCSSString] + " "
+                                + [self fontFamilyCSSString]];
+}
+
+@end

AppKit/CPTextView/CPFontPanel.j

@@ -0,0 +1,443 @@
+/*
+ * CPFontPanel.j
+ * AppKit
+ *
+ * TODOs:
+ *  1. make browser-width for size smaller and fix columns
+ *  2. add all the missing features from the MacOS X counterpart (sampleview)
+ *
+ *
+ * Created by Daniel Boehringer on 2/JAN/2014.
+ * All modifications copyright Daniel Boehringer 2013.
+ * Extensive code formatting and review by Andrew Hankinson
+ * Based on original work by
+ * Created by Emmanuel Maillard on 06/03/2010.
+ * Copyright Emmanuel Maillard 2010.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+@import "CPPanel.j"
+@import "CPColorWell.j"
+@import "CPColorPanel.j"
+@import "CPBrowser.j"
+@import "CPText.j"
+@import "CPFontManager.j"
+
+
+@class CPTextStorage
+@class CPLayoutManager
+@class CPTextContainer
+@class CPFontManager
+
+/*
+    Collection indexes
+*/
+var kTypefaceIndex_Normal = 0,
+    kTypefaceIndex_Italic = 1,
+    kTypefaceIndex_Bold = 2,
+    kTypefaceIndex_BoldItalic = 3,
+    kToolbarHeight = 32,
+    kBorderSpacing = 6,
+    kInnerSpacing = 2,
+    kNothingChanged = 0,
+    kFontNameChanged = 1,
+    kTypefaceChanged = 2,
+    kSizeChanged = 3,
+    kTextColorChanged = 4,
+    kBackgroundColorChanged = 5,
+    kUnderlineChanged = 6,
+    kWeightChanged = 7,
+    _sharedFontPanel;
+
+// FIXME<!> Locale support
+var _availableTraits= [@"Normal", @"Italic", @"Bold", @"Bold Italic"],
+    _availableSizes = [@"9", @"10", @"11", @"12", @"13", @"14", @"18", @"24", @"36", @"48", @"72", @"96"];
+
+
+/*!
+    @ingroup appkit
+    @class CPFontPanel
+*/
+@implementation CPFontPanel : CPPanel
+{
+    id      _fontBrowser;
+    id      _traitBrowser;
+    id      _sizeBrowser;
+    CPArray _availableFonts;
+    id      _textColorWell;
+    CPColor _textColor;
+    int     _currentColorButtonTag;
+    BOOL    _setupDone;
+    int     _fontChanges;
+}
+
+
+#pragma mark -
+#pragma mark Class methods
+
+/*!
+    Check if the shared Font panel exists.
+*/
++ (BOOL)sharedFontPanelExists
+{
+    return _sharedFontPanel !== nil;
+}
+
+/*!
+    Return the shared Font panel.
+*/
++ (CPFontPanel)sharedFontPanel
+{
+    if (!_sharedFontPanel)
+        _sharedFontPanel = [[CPFontPanel alloc] init];
+
+    return _sharedFontPanel;
+}
+
+
+#pragma mark -
+#pragma mark Init methods
+
+/*! @ignore */
+- (id)init
+{
+    if (self = [super initWithContentRect:CGRectMake(100, 90, 450, 394) styleMask:(CPTitledWindowMask | CPClosableWindowMask /*| CPResizableWindowMask*/ )])
+    {
+        [[self contentView] setBackgroundColor:[CPColor colorWithWhite:0.95 alpha:1.0]];
+        [self setTitle:@"Font Panel"];
+        [self setLevel:CPFloatingWindowLevel];
+        [self setFloatingPanel:YES];
+        [self setBecomesKeyOnlyIfNeeded:YES];
+        [self setMinSize:CGSizeMake(378, 394)];
+
+        _availableFonts = [[CPFontManager sharedFontManager] availableFonts];
+        _textColor      = [CPColor blackColor];
+        _setupDone      = NO;
+        _fontChanges    = kNothingChanged;
+    }
+
+    return self;
+}
+
+/*! @ignore */
+- (void)_setupToolbarView
+{
+    _toolbarView = [[CPView alloc] initWithFrame:CGRectMake(0, kBorderSpacing, CGRectGetWidth([self frame]), kToolbarHeight)];
+    [_toolbarView setAutoresizingMask:CPViewWidthSizable];
+
+    // Text color
+    _textColorWell = [[CPColorWell alloc] initWithFrame:CGRectMake(10, 0, 25, 25)];
+    [_textColorWell setColor:_textColor];
+    [_toolbarView addSubview:_textColorWell];
+}
+
+- (void)_setupBrowser:(CPBrowser)aBrowser
+{
+    [aBrowser setTarget:self];
+    [aBrowser setAction:@selector(browserClicked:)];
+    [aBrowser setDoubleAction:@selector(dblClicked:)];
+    [aBrowser setAllowsEmptySelection:NO];
+    [aBrowser setAllowsMultipleSelection:NO];
+    [aBrowser setDelegate:self];
+    [[self contentView] addSubview:aBrowser];
+}
+
+- (void)_setupContents
+{
+    if (_setupDone)
+        return;
+
+    _setupDone = YES;
+
+    [self _setupToolbarView];
+
+    var contentView = [self contentView],
+        label = [CPTextField labelWithTitle:@"Font name"],
+        contentBounds = [contentView bounds],
+        upperView = [[CPView alloc] initWithFrame:CGRectMake(0, 0, CGRectGetWidth(contentBounds), CGRectGetHeight(contentBounds) - (kBorderSpacing + kToolbarHeight + kInnerSpacing))];
+
+    [contentView addSubview:_toolbarView];
+
+    _fontBrowser = [[CPBrowser alloc] initWithFrame:CGRectMake(10,  35, 150, 350)];
+    _traitBrowser = [[CPBrowser alloc] initWithFrame:CGRectMake(155, 35, 150, 350)];
+    _sizeBrowser = [[CPBrowser alloc] initWithFrame:CGRectMake(300, 35, 140, 350)];
+
+    [self _setupBrowser:_fontBrowser];
+    [self _setupBrowser:_traitBrowser];
+    [self _setupBrowser:_sizeBrowser];
+
+    [[CPNotificationCenter defaultCenter] addObserver:self
+                                             selector:@selector(textViewDidChangeSelection:)
+                                                 name:CPTextViewDidChangeSelectionNotification
+                                               object:nil];
+}
+
+- (void)textViewDidChangeSelection:(CPNotification)notification
+{
+   [self _refreshWithTextView:[notification object]];
+
+}
+
+- (void)_refreshWithTextView:(CPTextView)textView
+{
+    if (![self isVisible])
+        return;
+
+    var attribs = [textView _attributesForFontPanel],
+        font = [attribs objectForKey:CPFontAttributeName] || [[textView textStorage] font] || [CPFont systemFontOfSize:12.0],
+        color = [attribs objectForKey:CPForegroundColorAttributeName];
+
+    if (!font)
+        return;
+
+    var trait = kTypefaceIndex_Normal;
+
+    if ([font isItalic] && [font isBold])
+        trait = kTypefaceIndex_BoldItalic;
+    else if ([font isItalic])
+        trait = kTypefaceIndex_Italic;
+    else if ([font isBold])
+        trait = kTypefaceIndex_Bold;
+
+    [self setCurrentFont:font];
+    [self setCurrentTrait:trait];
+    [self setCurrentSize:[font size] + ""];  //cast to string
+
+    if (!color)
+        return;
+
+    [_textColorWell setColor:color];
+}
+
+- (void)orderFront:(id)sender
+{
+    [self _setupContents];
+    [super orderFront:sender];
+    [self _refreshWithTextView:[[CPApp keyWindow] firstResponder]];
+}
+
+- (void)reloadDefaultFontFamilies
+{
+    _availableFonts = [[CPFontManager sharedFontManager] availableFonts];
+}
+
+- (BOOL)worksWhenModal
+{
+    return YES;
+}
+
+/*!
+    @param aFont the font to convert.
+    @return The converted font or \c aFont if failed to convert.
+*/
+- (CPFont)panelConvertFont:(CPFont)aFont
+{
+    var newFont = aFont,
+        index = 0;
+
+    switch (_fontChanges)
+    {
+        case kFontNameChanged:
+            newFont = [CPFont fontWithDescriptor:[[aFont fontDescriptor] fontDescriptorByAddingAttributes:
+                      [CPDictionary dictionaryWithObject:[self currentFont] forKey:CPFontNameAttribute]] size:0.0];
+            break;
+
+        case kTypefaceChanged:
+            index = [self currentTrait];
+            if (index == kTypefaceIndex_BoldItalic)
+                newFont = [[CPFontManager sharedFontManager] convertFont:aFont toHaveTrait:CPBoldFontMask | CPItalicFontMask];
+            else if (index == kTypefaceIndex_Bold)
+                newFont = [[CPFontManager sharedFontManager] convertFont:aFont toHaveTrait:CPBoldFontMask];
+            else if (index == kTypefaceIndex_Italic)
+                newFont = [[CPFontManager sharedFontManager] convertFont:aFont toHaveTrait:CPItalicFontMask];
+            else
+                newFont = [[CPFontManager sharedFontManager] convertFont:aFont toNotHaveTrait:CPBoldFontMask | CPItalicFontMask];
+            break;
+
+        case kSizeChanged:
+            newFont = [[CPFontManager sharedFontManager] convertFont:aFont toSize:[self currentSize]];
+            break;
+
+         case kNothingChanged:
+            break;
+
+        default:
+            CPLog.trace(@"FIXME: -[" + [self className] + " " + _cmd + "] unhandled _fontChanges: " + _fontChanges);
+            break;
+    }
+
+    return newFont;
+}
+
+- (void)setCurrentSize:(CGSize)aSize
+{
+    [_sizeBrowser selectRow:[_availableSizes indexOfObject:aSize]  inColumn:0];
+}
+
+- (CPString)currentSize
+{
+    return [_sizeBrowser selectedItem];
+}
+
+- (void)setCurrentFont:(CPFont)aFont
+{
+    [_fontBrowser selectRow:[_availableFonts indexOfObject:[aFont familyName]]  inColumn:0];
+}
+
+- (CPString)currentFont
+{
+    return [_fontBrowser selectedItem];
+}
+
+- (void)setCurrentTrait:(unsigned)aTrait
+{
+    var row = 0;
+
+    switch (aTrait)
+    {
+        case kTypefaceIndex_Italic:
+            row = 1;
+            break;
+
+        case kTypefaceIndex_Bold:
+            row = 2;
+            break;
+
+        case kTypefaceIndex_BoldItalic:
+            row = 3;
+            break;
+    }
+
+    [_traitBrowser selectRow:row  inColumn:0];
+}
+
+// FIXME<!> Locale support
+- (unsigned)currentTrait
+{
+    var sel = [_traitBrowser selectedItem];
+
+    if (sel === "Italic")
+        return kTypefaceIndex_Italic;
+
+    if (sel === "Bold")
+        return kTypefaceIndex_Bold;
+
+    if (sel === "Bold Italic")
+        return kTypefaceIndex_BoldItalic;
+
+    return kTypefaceIndex_Normal;
+}
+
+/*!
+    Set the selected font in Font panel.
+    @param font the selected font
+    @param flag if \c the current selection have multiple fonts.
+*/
+- (void)setPanelFont:(CPFont)font isMultiple:(BOOL)flag
+{
+    [self _setupContents];
+
+    if ([self currentFont] !== [font familyName])
+        [self setCurrentFont:[font familyName]];
+
+    if ([self currentSize] != [font size])
+        [self setCurrentSize:[font size]];
+
+    var typefaceIndex = kTypefaceIndex_Normal,
+        symbolicTraits = [[font fontDescriptor] symbolicTraits];
+
+    if ((symbolicTraits & CPFontItalicTrait) && (symbolicTraits & CPFontBoldTrait))
+        typefaceIndex = kTypefaceIndex_BoldItalic;
+    else if (symbolicTraits & CPFontItalicTrait)
+        typefaceIndex = kTypefaceIndex_Italic;
+    else if (symbolicTraits & CPFontBoldTrait)
+        typefaceIndex = kTypefaceIndex_Bold;
+
+    if ([self currentTrait] != typefaceIndex)
+        [self setCurrentTrait:typefaceIndex ];
+
+    _fontChanges = kNothingChanged;
+}
+
+- (void)changeColor:(id)sender
+{
+    _textColor = [sender color];
+    _fontChanges = kTextColorChanged;
+    [[CPFontManager sharedFontManager] modifyFontViaPanel:self];
+}
+
+////////////////////////////////////////////////////////////////////
+// TODO: ask CPFontManager for traits //
+- (void)browserClicked:(id)aBrowser
+{
+    if (aBrowser === _fontBrowser)
+    {
+        _fontChanges = kFontNameChanged;
+        [[CPFontManager sharedFontManager] modifyFontViaPanel:self];
+    }
+    else if (aBrowser === _traitBrowser)
+    {
+        _fontChanges = kTypefaceChanged;
+        [[CPFontManager sharedFontManager] modifyFontViaPanel:self];
+    }
+    else if (aBrowser === _sizeBrowser)
+    {
+        _fontChanges = kSizeChanged;
+        [[CPFontManager sharedFontManager] modifyFontViaPanel:self];
+    }
+}
+
+- (void)dblClicked:(id)sender
+{
+    //   alert("DOUBLE");
+}
+
+- (id)browser:(id)aBrowser numberOfChildrenOfItem:(id)anItem
+{
+    if (aBrowser === _fontBrowser)
+        return [_availableFonts count];
+
+    if (aBrowser === _traitBrowser)
+        return [_availableTraits count]
+
+    return [_availableSizes count]
+}
+
+- (id)browser:(id)aBrowser child:(int)index ofItem:(id)anItem
+{
+    if (aBrowser === _fontBrowser)
+        return [_availableFonts objectAtIndex:index];
+
+    if (aBrowser === _traitBrowser)
+        return [_availableTraits objectAtIndex:index];
+
+    return [_availableSizes objectAtIndex:index];
+}
+
+- (id)browser:(id)aBrowser objectValueForItem:(id)anItem
+{
+    return anItem;
+}
+
+- (BOOL)browser:(id)aBrowser isLeafItem:(id)anItem
+{
+    return YES;
+}
+
+@end
+
+[CPFontManager setFontPanelFactory:[CPFontPanel class]];

AppKit/CPTextView/CPParagraphStyle.j

@@ -0,0 +1,223 @@
+/*
+ *  CPParagraphStyle.j
+ *  AppKit
+ *
+ * FIXME
+ *  This is basically a stub.
+ *  We need to store all the spacing informations as well as writing direction (among others)
+ *
+ *  Created by Daniel Boehringer on 11/01/2014
+ *  Copyright Daniel Boehringer 2014.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPObject.j>
+@import <Foundation/CPArray.j>
+
+@import "CPText.j"
+
+CPLeftTabStopType = 0;
+
+CPParagraphStyleAttributeName = @"CPParagraphStyleAttributeName";
+
+var _sharedDefaultParagraphStyle,
+    _defaultTabStopArray;
+
+@implementation CPParagraphStyle : CPObject
+{
+    CPArray         _tabStops               @accessors(property=tabStops);
+    CPTextAlignment _alignment              @accessors(property=alignment);
+    unsigned        _firstLineHeadIndent    @accessors(property=firstLineHeadIndent);
+    unsigned        _headIndent             @accessors(property=headIndent);
+    unsigned        _tailIndent             @accessors(property=tailIndent);
+    unsigned        _paragraphSpacing       @accessors(property=paragraphSpacing);
+    unsigned        _minimumLineHeight      @accessors(property=minimumLineHeight);
+    unsigned        _maximumLineHeight      @accessors(property=maximumLineHeight);
+    unsigned        _lineSpacing            @accessors(property=lineSpacing);
+}
+
+
+#pragma mark -
+#pragma mark Class methods
+
++ (CPParagraphStyle)defaultParagraphStyle
+{
+    if (!_sharedDefaultParagraphStyle)
+       _sharedDefaultParagraphStyle = [self new];
+
+    return _sharedDefaultParagraphStyle;
+}
+
++ (CPArray)_defaultTabStops
+{
+    if (!_defaultTabStopArray)
+    {
+        var i;
+        _defaultTabStopArray = [];
+
+        // <!> FIXME: Define constants for these magic numbers: 13, 28
+         for (i = 1; i < 16 ; i++)
+         {
+            _defaultTabStopArray.push([[CPTextTab alloc] initWithType:CPLeftTabStopType location:i * 28]);
+         }
+    }
+
+    return _defaultTabStopArray;
+}
+
+
+#pragma mark -
+#pragma mark Init methods
+
+- (id)init
+{
+    [self _initWithDefaults];
+
+    return self;
+}
+
+- (CPParagraphStyle)initWithParagraphStyle:(CPParagraphStyle)other
+{
+    self = [super init];
+
+    _tabStops = [other._tabStops copy];
+    _alignment = other._alignment;
+    _firstLineHeadIndent = other._firstLineHeadIndent;
+    _headIndent = other._headIndent;
+    _tailIndent = other._tailIndent;
+    _paragraphSpacing = other._paragraphSpacing;
+    _minimumLineHeight = other._minimumLineHeight;
+    _maximumLineHeight = other._maximumLineHeight;
+    _lineSpacing = other._lineSpacing;
+
+    return self;
+}
+
+- (void)_initWithDefaults
+{
+    _alignment = CPLeftTextAlignment;
+    _tabStops = [[[self class] _defaultTabStops] copy];
+}
+
+- (void)addTabStop:(CPTextTab)aStop
+{
+    _tabStops.push(aStop);
+}
+
+- (id)copy
+{
+    var other = [[self class] alloc];
+
+    return [other initWithParagraphStyle:self];
+}
+
+@end
+
+
+var CPParagraphStyleTabStopsKey = @"CPParagraphStyleTabStopsKey",
+    CPParagraphStyleAlignmentKey = @"CPParagraphStyleAlignmentKey",
+    CPParagraphStyleFirstLineHeadIndentKey = @"CPParagraphStyleFirstLineHeadIndentKey",
+    CPParagraphStyleHeadIndentKey = @"CPParagraphStyleHeadIndentKey",
+    CPParagraphStyleTailIndentKey = @"CPParagraphStyleTailIndentKey",
+    CPParagraphStyleParagraphSpacingKey = @"CPParagraphStyleParagraphSpacingKey",
+    CPParagraphStyleMinimumLineHeightKey = @"CPParagraphStyleMinimumLineHeightKey",
+    CPParagraphStyleMaximumLineHeightKey = @"CPParagraphStyleMaximumLineHeightKey",
+    CPParagraphStyleLineSpacingKey = @"CPParagraphStyleLineSpacingKey";
+
+@implementation CPParagraphStyle (CPCoding)
+
+- (id)initWithCoder:(id)aCoder
+{
+    self = [self init];
+
+    if (self)
+    {
+        _tabStops = [aCoder decodeObjectForKey:"CPParagraphStyleTabStopsKey"];
+        _alignment = [aCoder decodeIntForKey:"CPParagraphStyleAlignmentKey"];
+        _firstLineHeadIndent = [aCoder decodeIntForKey:"CPParagraphStyleFirstLineHeadIndentKey"];
+        _headIndent = [aCoder decodeIntForKey:"CPParagraphStyleHeadIndentKey"];
+        _tailIndent = [aCoder decodeIntForKey:"CPParagraphStyleTailIndentKey"];
+        _paragraphSpacing = [aCoder decodeIntForKey:"CPParagraphStyleParagraphSpacingKey"];
+        _minimumLineHeight = [aCoder decodeIntForKey:"CPParagraphStyleMinimumLineHeightKey"];
+        _maximumLineHeight = [aCoder decodeIntForKey:"CPParagraphStyleMaximumLineHeightKey"];
+        _lineSpacing = [aCoder decodeIntForKey:"CPParagraphStyleLineSpacingKey"];
+    }
+
+    return self;
+}
+
+- (void)encodeWithCoder:(id)aCoder
+{
+    [aCoder encodeInt:_alignment forKey:"CPParagraphStyleAlignmentKey"];
+    [aCoder encodeObject:_tabStops forKey:"CPParagraphStyleTabStopsKey"];
+    [aCoder encodeInt:_firstLineHeadIndent forKey:"CPParagraphStyleFirstLineHeadIndentKey"];
+    [aCoder encodeInt:_headIndent forKey:"CPParagraphStyleHeadIndentKey"];
+    [aCoder encodeInt:_tailIndent forKey:"CPParagraphStyleTailIndentKey"];
+    [aCoder encodeInt:_paragraphSpacing forKey:"CPParagraphStyleParagraphSpacingKey"];
+    [aCoder encodeInt:_minimumLineHeight forKey:"CPParagraphStyleMinimumLineHeightKey"];
+    [aCoder encodeInt:_maximumLineHeight forKey:"CPParagraphStyleMaximumLineHeightKey"];
+    [aCoder encodeInt:_lineSpacing forKey:"CPParagraphStyleLineSpacingKey"];
+}
+
+
+@end
+
+
+@implementation CPTextTab : CPObject
+{
+    int    _type     @accessors(property = tabStopType);
+    double _location @accessors(property = location);
+}
+
+- (id)initWithType:(CPTabStopType) aType location:(double) aLocation
+{
+    if ([self = [super init]])
+    {
+        _type = aType;
+        _location = aLocation;
+    }
+
+    return self;
+}
+
+@end
+
+
+var CPTextTabTypeKey = @"CPTextTabTypeKey",
+    CPTextTabLocationKey = @"CPTextTabLocationKey";
+
+@implementation CPTextTab (CPCoding)
+
+- (id)initWithCoder:(id)aCoder
+{
+    self = [self init];
+
+    if (self)
+    {
+        _type = [aCoder decodeIntForKey:"CPTextTabTypeKey"];
+        _location = [aCoder decodeDoubleForKey:"CPTextTabLocationKey"];
+    }
+
+    return self;
+}
+
+- (void)encodeWithCoder:(id)aCoder
+{
+    [aCoder encodeInt:_type forKey:"CPTextTabTypeKey"];
+    [aCoder encodeDouble:_location forKey:"CPTextTabLocationKey"];
+}
+
+@end

AppKit/CPTextView/CPTextContainer.j

@@ -0,0 +1,255 @@
+/*
+ *  CPTextContainer.j
+ *  AppKit
+ *
+ *  Created by Emmanuel Maillard on 27/02/2010.
+ *  Copyright Emmanuel Maillard 2010.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPGeometry.j>
+@import "CPLayoutManager.j"
+
+@class CPTextView
+@class CPLayoutManager
+
+/*
+    @global
+    @group CPLineSweepDirection
+*/
+CPLineSweepLeft = 0;
+/*
+    @global
+    @group CPLineSweepDirection
+*/
+CPLineSweepRight = 1;
+/*
+    @global
+    @group CPLineSweepDirection
+*/
+CPLineSweepDown = 2;
+/*
+    @global
+    @group CPLineSweepDirection
+*/
+CPLineSweepUp = 3;
+
+/*
+    @global
+    @group CPLineMovementDirection
+*/
+CPLineDoesntMoves = 0;
+/*
+    @global
+    @group CPLineMovementDirection
+*/
+CPLineMovesLeft = 1;
+/*
+    @global
+    @group CPLineMovementDirection
+*/
+CPLineMovesRight = 2;
+/*
+    @global
+    @group CPLineMovementDirection
+*/
+CPLineMovesDown = 3;
+/*
+    @global
+    @group CPLineMovementDirection
+*/
+CPLineMovesUp = 4;
+
+/*!
+    @ingroup appkit
+    @class CPTextContainer
+*/
+@implementation CPTextContainer : CPObject
+{
+    float           _lineFragmentPadding    @accessors(property=lineFragmentPadding);
+    CGSize          _size                   @accessors(property=containerSize)
+    CPLayoutManager _layoutManager          @accessors(property=layoutManager);
+    CPTextView      _textView               @accessors(property=textView);
+    BOOL            _inResizing;
+}
+
+
+#pragma mark -
+#pragma mark Init methods
+
+- (id)initWithContainerSize:(CGSize)aSize
+{
+    self = [super init];
+
+    if (self)
+    {
+        _size = aSize;
+        [self _init];
+    }
+
+    return self;
+}
+
+- (id)init
+{
+    return [self initWithContainerSize:CPMakeSize(1e7, 1e7)];
+}
+
+- (void)_init
+{
+    _lineFragmentPadding = 0.0;
+
+    _layoutManager = [[CPLayoutManager alloc] init];
+    [_layoutManager addTextContainer:self];
+}
+
+#pragma mark -
+#pragma mark Setter methods
+
+- (void)setContainerSize:(CGSize)someSize
+{
+    var oldSize = _size;
+
+    _size = CGSizeMakeCopy(someSize);
+
+    if (oldSize.width != _size.width)
+    {
+        _inResizing = YES;
+        [_layoutManager invalidateLayoutForCharacterRange:CPMakeRange(0, [[_layoutManager textStorage] length])
+                                                   isSoft:NO
+                                     actualCharacterRange:NULL];
+
+        [_layoutManager _validateLayoutAndGlyphs];
+        [_textView sizeToFit]; // this is necessary to adopt the height of CPTextView in case of rewrapping
+        _inResizing = NO;
+    }
+}
+
+// Controls whether the receiver adjusts the width of its bounding rectangle when its text view is resized.
+- (void)setWidthTracksTextView:(BOOL)flag
+{
+    [_textView setPostsFrameChangedNotifications:flag];
+
+    if (flag)
+    {
+        [[CPNotificationCenter defaultCenter] addObserver:self
+                                                 selector:@selector(textViewFrameChanged:)
+                                                     name:CPViewFrameDidChangeNotification
+                                                   object:_textView];
+    }
+    else
+    {
+        [[CPNotificationCenter defaultCenter] removeObserver:self
+                                                        name:CPViewFrameDidChangeNotification
+                                                      object:_textView];
+    }
+}
+
+- (void)textViewFrameChanged:(CPNotification)aNotification
+{
+    var newSize = CGSizeMake([_textView frame].size.width, _size.height);
+
+    [self setContainerSize:newSize];
+}
+
+- (void)setTextView:(CPTextView)aTextView
+{
+    if (_textView)
+    {
+        [self _removeAllLines];
+        [_textView setTextContainer:nil];
+    }
+
+    _textView = aTextView;
+
+    if (_textView)
+        [_textView setTextContainer:self];
+
+    [_layoutManager textContainerChangedTextView:self];
+}
+
+- (BOOL)containsPoint:(CGPoint)aPoint
+{
+    return CGRectContainsPoint(CGRectMake(0, 0, _size.width, _size.height), aPoint);
+}
+
+- (BOOL)isSimpleRectangularTextContainer
+{
+    return YES;
+}
+
+- (CGRect)lineFragmentRectForProposedRect:(CGRect)proposedRect
+                           sweepDirection:(CPLineSweepDirection)sweep
+                        movementDirection:(CPLineMovementDirection)movement
+                            remainingRect:(CGRectPointer)remainingRect
+{
+    var resultRect = CGRectCreateCopy(proposedRect);
+
+    if (sweep != CPLineSweepRight || movement != CPLineMovesDown)
+    {
+        CPLog.trace(@"FIXME: unsupported sweep (" + sweep + ") or movement (" + movement + ")");
+        return CGRectMakeZero();
+    }
+
+    if (resultRect.origin.x + resultRect.size.width > _size.width)
+        resultRect.size.width = _size.width - resultRect.origin.x;
+
+    if (resultRect.size.width < 0)
+        resultRect = CGRectMakeZero();
+
+    if (remainingRect)
+    {
+        remainingRect.origin.x = resultRect.origin.x + resultRect.size.width;
+        remainingRect.origin.y = resultRect.origin.y;
+        remainingRect.size.height =  resultRect.size.height;
+        remainingRect.size.width = _size.width - (resultRect.origin.x + resultRect.size.width);
+    }
+
+    return resultRect;
+}
+
+@end
+
+
+var CPTextContainerSizeKey  = @"CPTextContainerSizeKey",
+    CPTextContainerLayoutManagerKey  = @"CPTextContainerLayoutManagerKey";
+
+@implementation CPTextContainer (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super init];
+
+    if (self)
+    {
+        [self _init];
+
+        _size = [aCoder decodeSizeForKey:CPTextContainerSizeKey];
+
+        _layoutManager = [aCoder decodeObjectForKey:CPTextContainerLayoutManagerKey];
+        [_layoutManager addTextContainer:self];
+    }
+
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [aCoder encodeSize:_size forKey:CPTextContainerSizeKey];
+    [aCoder encodeObject:_layoutManager forKey:CPTextContainerLayoutManagerKey];
+}
+
+@end

AppKit/CPTextView/CPTextStorage.j

@@ -0,0 +1,303 @@
+/*
+ * CPTextStorage.j
+ * AppKit
+ *
+ * Created by Emmanuel Maillard on 27/02/2010.
+ * Copyright Emmanuel Maillard 2010.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+
+@import <Foundation/CPNotificationCenter.j>
+@import <Foundation/CPAttributedString.j>
+
+@import "CPText.j"
+@import "CPFont.j"
+
+@class CPLayoutManager;
+
+CPTextStorageEditedAttributes = 1;
+CPTextStorageEditedCharacters = 2;
+
+CPTextStorageWillProcessEditingNotification = @"CPTextStorageWillProcessEditingNotification";
+CPTextStorageDidProcessEditingNotification = @"CPTextStorageDidProcessEditingNotification";
+
+@protocol CPTextStorageDelegate <CPObject>
+
+- (void)textStorageWillProcessEditing:(CPNotification)aNotification;
+- (void)textStorageDidProcessEditing:(CPNotification)aNotification;
+
+@end
+
+
+var CPTextStorageDelegate_textStorageWillProcessEditing_ = 1 << 1,
+    CPTextStorageDelegate_textStorageDidProcessEditing_ = 1 << 2;
+
+/*!
+    @ingroup appkit
+    @class CPTextStorage
+*/
+@implementation CPTextStorage : CPMutableAttributedString
+{
+    CPColor                         _foregroundColor @accessors(property=foregroundColor);
+    CPFont                          _font            @accessors(property=font);
+    CPMutableArray                  _layoutManagers  @accessors(getter=layoutManagers);
+    CPRange                         _editedRange     @accessors(getter=editedRange);
+    id <CPTextStorageDelegate>      _delegate        @accessors(property=delegate);
+    int                             _changeInLength  @accessors(property=changeInLength);
+    unsigned                        _editedMask      @accessors(property=editedMask);
+
+    int                             _editCount; // {begin,end}Editing counter
+    unsigned                        _implementedDelegateMethods;
+}
+
+
+#pragma mark -
+#pragma mark Init methods
+
+- (id)initWithString:(CPString)aString attributes:(CPDictionary)attributes
+{
+    self = [super initWithString:aString attributes:attributes];
+
+    if (self)
+    {
+        _layoutManagers = [[CPMutableArray alloc] init];
+        _editedRange = CPMakeRange(CPNotFound, 0);
+        _changeInLength = 0;
+        _editedMask = 0;
+    }
+
+    return self;
+}
+
+- (id)initWithString:(CPString)aString
+{
+    return [self initWithString:aString attributes:nil];
+}
+
+- (id)init
+{
+    return [self initWithString:@"" attributes:nil];
+}
+
+
+#pragma mark -
+#pragma mark Delegate methods
+
+- (void)setDelegate:(id <CPTextStorageDelegate>)aDelegate
+{
+    if (_delegate === aDelegate)
+        return;
+
+    _implementedDelegateMethods = 0;
+    _delegate = aDelegate;
+
+    if (_delegate)
+    {
+        if ([_delegate respondsToSelector:@selector(textStorageWillProcessEditing:)])
+            _implementedDelegateMethods |= CPTextStorageDelegate_textStorageWillProcessEditing_;
+
+        if ([_delegate respondsToSelector:@selector(textStorageDidProcessEditing:)])
+            _implementedDelegateMethods |= CPTextStorageDelegate_textStorageDidProcessEditing_;
+    }
+}
+
+
+#pragma mark -
+#pragma mark Layout manager methods
+
+- (void)addLayoutManager:(CPLayoutManager)aManager
+{
+    if ([_layoutManagers containsObject:aManager])
+        return
+
+    [aManager setTextStorage:self];
+    [_layoutManagers addObject:aManager];
+}
+
+- (void)removeLayoutManager:(CPLayoutManager)aManager
+{
+    if (![_layoutManagers containsObject:aManager])
+        return
+
+    [aManager setTextStorage:nil];
+    [_layoutManagers removeObject:aManager];
+}
+
+- (void)invalidateAttributesInRange:(CPRange)aRange
+{
+    /* FIXME: stub */
+}
+
+
+#pragma mark -
+#pragma mark Editing methods
+
+- (void)processEditing
+{
+    [self _sendDelegateWillProcessEditingNotification];
+    [self invalidateAttributesInRange:[self editedRange]];
+    [self _sendDelegateDidProcessEditingNotification];
+
+    var c = [_layoutManagers count];
+
+    for (var i = 0; i < c; i++)
+    {
+        [[_layoutManagers objectAtIndex:i] textStorage:self
+                                                edited:_editedMask
+                                                 range:_editedRange
+                                        changeInLength:_changeInLength
+                                      invalidatedRange:_editedRange];
+    }
+
+    _editedRange.location = CPNotFound;
+    _editedMask = 0;
+    _changeInLength = 0;
+}
+
+- (void)beginEditing
+{
+    if (_editCount == 0)
+        _editedRange = CPMakeRange(CPNotFound, 0);
+
+    _editCount++;
+}
+
+- (void)endEditing
+{
+    _editCount--;
+
+    if (_editCount == 0)
+        [self processEditing];
+}
+
+- (void)edited:(unsigned)editedMask range:(CPRange)aRange changeInLength:(int)lengthChange
+{
+    var copyRange = CPMakeRangeCopy(aRange);
+
+    if (_editCount == 0) // used outside a beginEditing/endEditing
+    {
+        _editedMask = editedMask;
+        _changeInLength = lengthChange;
+        copyRange.length += lengthChange;
+        _editedRange = copyRange;
+        [self processEditing];
+    }
+    else
+    {
+        _editedMask |= editedMask;
+        _changeInLength += lengthChange;
+        copyRange.length += lengthChange;
+
+        if (_editedRange.location == CPNotFound)
+            _editedRange = copyRange;
+        else
+            _editedRange = CPUnionRange(_editedRange,copyRange);
+    }
+}
+
+- (void)removeAttribute:(CPString)anAttribute range:(CPRange)aRange
+{
+    [self beginEditing];
+    [super removeAttribute:anAttribute range:aRange];
+    [self edited:CPTextStorageEditedAttributes range:aRange changeInLength:0];
+    [self endEditing];
+}
+
+- (void)addAttributes:(CPDictionary)aDictionary range:(CPRange)aRange
+{
+    [self beginEditing];
+    [super addAttributes:aDictionary range:aRange];
+    [self edited:CPTextStorageEditedAttributes range:aRange changeInLength:0];
+    [self endEditing];
+}
+
+- (void)deleteCharactersInRange:(CPRange)aRange
+{
+    [self beginEditing];
+    [super deleteCharactersInRange:aRange];
+    [self edited:CPTextStorageEditedCharacters range:aRange changeInLength:-aRange.length];
+    [self endEditing];
+}
+
+- (void)replaceCharactersInRange:(CPRange)aRange withString:(CPString)aString
+{
+    [self beginEditing];
+    [super replaceCharactersInRange:aRange withString:aString];
+    [self edited:CPTextStorageEditedCharacters range:aRange changeInLength:([aString length] - aRange.length)];
+    [self endEditing];
+}
+
+- (void)replaceCharactersInRange:(CPRange)aRange withAttributedString:(CPAttributedString)aString
+{
+    [self beginEditing];
+    [super replaceCharactersInRange:aRange withAttributedString:aString];
+    [self edited:(CPTextStorageEditedAttributes | CPTextStorageEditedCharacters) range:aRange changeInLength:([aString length] - aRange.length)];
+    [self endEditing];
+}
+
+- (CPAttributedString)attributedSubstringFromRange:(CPRange)aRange
+{
+    if (!aRange.length)
+        return [CPAttributedString new];
+
+    return [super attributedSubstringFromRange:aRange];
+}
+
+@end
+
+
+@implementation CPTextStorage (CPTextStorageDelegate)
+
+- (void)_sendDelegateWillProcessEditingNotification
+{
+    if (_implementedDelegateMethods & CPTextStorageDelegate_textStorageWillProcessEditing_)
+        [_delegate textStorageWillProcessEditing:[[CPNotification alloc] initWithName:CPTextStorageWillProcessEditingNotification object:self userInfo:nil]];
+
+    [[CPNotificationCenter defaultCenter] postNotificationName:CPTextStorageWillProcessEditingNotification object:self];
+}
+
+- (void)_sendDelegateDidProcessEditingNotification
+{
+    if (_implementedDelegateMethods & CPTextStorageDelegate_textStorageDidProcessEditing_)
+        [_delegate textStorageWillProcessEditing:[[CPNotification alloc] initWithName:CPTextStorageDidProcessEditingNotification object:self userInfo:nil]];
+
+    [[CPNotificationCenter defaultCenter] postNotificationName:CPTextStorageDidProcessEditingNotification object:self];
+}
+
+@end
+
+
+@implementation CPTextStorage (CPCoding)
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [super initWithCoder:aCoder];
+
+    if (self)
+    {
+
+    }
+
+    return self;
+}
+
+- (void)encodeWithCoder:(CPCoder)aCoder
+{
+    [super encodeWithCoder:aCoder];
+}
+
+@end

AppKit/CPTextView/CPTypesetter.j

@@ -0,0 +1,430 @@
+
+/*
+ *  CPTypesetter.j
+ *  AppKit
+ *
+ *  Created by Daniel Boehringer on 27/12/2013.
+ *  All modifications copyright Daniel Boehringer 2013.
+ *  Extensive code formatting and review by Andrew Hankinson
+ *  Based on original work by
+ *  Emmanuel Maillard on 27/02/2010.
+ *  Copyright Emmanuel Maillard 2010.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPObject.j>
+
+@import "CPParagraphStyle.j"
+@import "CPTextStorage.j"
+@import "CPFont.j"
+
+// forward declare these classes for type matching
+@class CPLayoutManager
+@class CPTextContainer
+@class CPTextView
+
+/*
+    CPTypesetterControlCharacterAction
+*/
+CPTypesetterZeroAdvancementAction = 1 << 0;
+CPTypesetterWhitespaceAction      = 1 << 1;
+CPSTypesetterHorizontalTabAction  = 1 << 2;
+CPTypesetterLineBreakAction       = 1 << 3;
+CPTypesetterParagraphBreakAction  = 1 << 4;
+CPTypesetterContainerBreakAction  = 1 << 5;
+
+var CPSystemTypesetterFactory,
+    _sharedSimpleTypesetter;
+
+@implementation CPTypesetter : CPObject
+
+
+#pragma mark -
+#pragma mark Class methods
+
++ (void)initialize
+{
+    [CPTypesetter _setSystemTypesetterFactory:[CPSimpleTypesetter class]];
+}
+
++ (id)sharedSystemTypesetter
+{
+    return [CPSystemTypesetterFactory sharedInstance];
+}
+
++ (void)_setSystemTypesetterFactory:(Class)aClass
+{
+    CPSystemTypesetterFactory = aClass;
+}
+
+- (CPTypesetterControlCharacterAction)actionForControlCharacterAtIndex:(unsigned)charIndex
+{
+    return CPTypesetterZeroAdvancementAction;
+}
+
+- (CPLayoutManager)layoutManager
+{
+    return nil;
+}
+
+- (CPTextContainer)currentTextContainer
+{
+    return nil;
+}
+
+- (CPArray)textContainers
+{
+    return nil;
+}
+
+- (void)layoutGlyphsInLayoutManager:(CPLayoutManager)layoutManager
+        startingAtGlyphIndex:(unsigned)startGlyphIndex
+        maxNumberOfLineFragments:(unsigned)maxNumLines
+        nextGlyphIndex:(UIntegerReference)nextGlyph
+{
+   _CPRaiseInvalidAbstractInvocation(self, _cmd);
+}
+
+@end
+
+@implementation CPSimpleTypesetter : CPTypesetter
+{
+    CPLayoutManager     _layoutManager          @accessors(property=layoutManager);
+    CPTextContainer     _currentTextContainer   @accessors(property=currentTextContainer);
+    CPTextStorage       _textStorage;
+
+    CPRange             _attributesRange;
+    CPDictionary        _currentAttributes;
+    CPParagraphStyle    _currentParagraph;
+
+    float               _lineHeight;
+    float               _lineBase;
+    float               _lineWidth;
+
+    unsigned            _indexOfCurrentContainer;
+
+    CPArray             _lineFragments;
+}
+
+
+#pragma mark -
+#pragma mark Class methods
+
++ (id)sharedInstance
+{
+    if (!_sharedSimpleTypesetter)
+        _sharedSimpleTypesetter = [[CPSimpleTypesetter alloc] init];
+
+    return _sharedSimpleTypesetter;
+}
+
+- (CPArray)textContainers
+{
+    return [_layoutManager textContainers];
+}
+
+- (CPTextTab)textTabForWidth:(double)aWidth writingDirection:(CPWritingDirection)direction
+{
+    var tabStops = [_currentParagraph tabStops];
+
+    if (!tabStops)
+        tabStops = [CPParagraphStyle _defaultTabStops];
+
+    var l = tabStops.length;
+
+    if (aWidth > tabStops[l - 1]._location)
+        return nil;
+
+    for (var i = l - 1; i >= 0; i--)
+    {
+        if (aWidth > tabStops[i]._location)
+        {
+            if (i + 1 < l)
+                return tabStops[i + 1];
+        }
+    }
+
+    if (i === -1)
+        return tabStops[0];
+
+    return nil;
+}
+
+- (BOOL)_flushRange:(CPRange)lineRange
+         lineOrigin:(CGPoint)lineOrigin
+   currentContainer:(CPTextContainer)aContainer
+       advancements:(CPArray)advancements
+          lineCount:(unsigned)lineCount
+           sameLine:(BOOL)sameLine
+{
+    var myX = 0,
+        rect = CGRectMake(lineOrigin.x, lineOrigin.y, _lineWidth, _lineHeight),
+        containerSize = aContainer._size;
+
+    [_layoutManager _appendNewLineFragmentInTextContainer:_currentTextContainer forGlyphRange:lineRange]
+
+    var fragment = [_layoutManager._lineFragments lastObject];
+    fragment._isLast = !sameLine;
+    _lineFragments.push(fragment);
+
+    [_layoutManager setLineFragmentRect:rect forGlyphRange:lineRange usedRect:rect];
+
+    switch ([_currentParagraph alignment])
+    {
+        case CPLeftTextAlignment:
+            myX = 0;
+            break;
+
+        case CPCenterTextAlignment:
+            myX = (containerSize.width - _lineWidth) / 2;
+            break;
+
+        case CPRightTextAlignment:
+            myX = containerSize.width - _lineWidth;
+            break;
+    }
+
+    [_layoutManager setLocation:CGPointMake(myX, _lineBase) forStartOfGlyphRange:lineRange];
+    [_layoutManager _setAdvancements:advancements forGlyphRange:lineRange];
+
+    if (!sameLine) //fix the _lineFragments when fontsizes differ
+    {
+        var l = _lineFragments.length;
+
+        for (var i = 0 ; i < l ; i++)
+            [_lineFragments[i] _adjustForHeight:_lineHeight];
+    }
+
+    if (!lineCount)  // do not rescue on first line
+        return NO;
+
+    if (aContainer._inResizing)
+        return NO;
+
+    return ([_layoutManager _rescuingInvalidFragmentsWasPossibleForGlyphRange:lineRange]);
+}
+
+- (void)layoutGlyphsInLayoutManager:(CPLayoutManager)layoutManager
+        startingAtGlyphIndex:(unsigned)glyphIndex
+        maxNumberOfLineFragments:(unsigned)maxNumLines
+        nextGlyphIndex:(UIntegerReference)nextGlyph
+{
+    var textContainers = [layoutManager textContainers],
+        textContainersCount = [textContainers count];
+
+    _layoutManager = layoutManager;
+    _textStorage = [_layoutManager textStorage];
+    _indexOfCurrentContainer = MAX(0, [textContainers
+                                   indexOfObject:[_layoutManager textContainerForGlyphAtIndex:glyphIndex effectiveRange:nil withoutAdditionalLayout:YES]
+                                         inRange:CPMakeRange(0, textContainersCount)]);
+
+    _currentTextContainer = textContainers[_indexOfCurrentContainer];
+
+    _attributesRange = CPMakeRange(0, 0);
+    _lineHeight = 0;
+    _lineBase = 0;
+    _lineWidth = 0;
+
+    var containerSize = [_currentTextContainer containerSize],
+        containerSizeWidth = containerSize.width,
+        containerSizeHeight = containerSize.height,
+        lineRange = CPMakeRange(glyphIndex, 0),
+        wrapRange = CPMakeRange(0, 0),
+        wrapWidth = 0,
+        isNewline = NO,
+        isTabStop = NO,
+        isWordWrapped = NO,
+        numberOfGlyphs= [_textStorage length],
+        leading,
+        numLines = 0,
+        theString = [_textStorage string],
+        lineOrigin,
+        ascent,
+        descent,
+        advancements = [],
+        prevRangeWidth = 0,
+        measuringRange = CPMakeRange(glyphIndex, 0),
+        currentAnchor = 0,
+        currentFont,
+        currentFontLineHeight,
+        previousFont,
+        currentParagraphMinimumLineHeight,
+        currentParagraphMaximumLineHeight,
+        currentParagraphLineSpacing;
+
+    if (glyphIndex > 0)
+        lineOrigin = CGPointCreateCopy([_layoutManager lineFragmentRectForGlyphAtIndex:glyphIndex effectiveRange:nil].origin);
+    else if ([_layoutManager extraLineFragmentTextContainer])
+        lineOrigin = CGPointMake(0, [_layoutManager extraLineFragmentUsedRect].origin.y);
+    else
+        lineOrigin = CGPointMake(0, 0);
+
+    [_layoutManager _removeInvalidLineFragments];
+
+    if (![_textStorage length])
+        return;
+
+    _lineFragments = [];
+
+    for (; numLines != maxNumLines && glyphIndex < numberOfGlyphs; glyphIndex++)
+    {
+        // check whether there any change in the attributes from here on
+        if (!CPLocationInRange(glyphIndex, _attributesRange))
+        {
+            _currentAttributes = [_textStorage attributesAtIndex:glyphIndex effectiveRange:_attributesRange];
+            currentFont = [_currentAttributes objectForKey:CPFontAttributeName];
+            _currentParagraph = [_currentAttributes objectForKey:CPParagraphStyleAttributeName] || [CPParagraphStyle defaultParagraphStyle];
+            currentParagraphMinimumLineHeight = [_currentParagraph minimumLineHeight];
+            currentParagraphMaximumLineHeight = [_currentParagraph maximumLineHeight];
+            currentParagraphLineSpacing = [_currentParagraph lineSpacing];
+
+            if (!currentFont)
+                currentFont = [_textStorage font] || [CPFont systemFontOfSize:12.0];
+
+            ascent = [currentFont ascender]
+            descent = [currentFont descender]
+            leading = (ascent - descent) * 0.2; // FAKE leading
+
+            currentFontLineHeight = ascent - descent + leading;
+
+            if (previousFont !== currentFont)
+            {
+                measuringRange = CPMakeRange(glyphIndex, 0);
+                currentAnchor = prevRangeWidth;
+                previousFont = currentFont;
+            }
+
+        }
+
+        if (currentFontLineHeight > _lineHeight)
+            _lineHeight = currentFontLineHeight;
+
+        if (ascent > _lineBase)
+            _lineBase = ascent;
+
+        lineRange.length++;
+        measuringRange.length++;
+
+        var currentCharCode = theString.charCodeAt(glyphIndex),  // use pure javascript methods for performance reasons
+            rangeWidth = [theString.substr(measuringRange.location, measuringRange.length) sizeWithFont:currentFont inWidth:NULL].width + currentAnchor;
+
+        switch (currentCharCode)    // faster than sending actionForControlCharacterAtIndex: called for each char.
+        {
+            case 9: // '\t'
+            {
+                var nextTab = [self textTabForWidth:rangeWidth + lineOrigin.x writingDirection:0];
+
+                isTabStop = YES;
+
+                if (nextTab)
+                    rangeWidth = nextTab._location - lineOrigin.x;
+                else
+                    rangeWidth += 28;   //FIXME
+            }  // fallthrough intentional
+            case 32: // ' '
+                wrapRange = CPMakeRangeCopy(lineRange);
+                wrapWidth = rangeWidth;
+                wrapRange._height = _lineHeight;
+                wrapRange._base = _lineBase;
+                break;
+
+            case 10:
+            case 13:
+                isNewline = YES;
+        }
+
+        advancements.push({width: rangeWidth - prevRangeWidth, height: ascent, descent: descent});
+
+        prevRangeWidth = _lineWidth = rangeWidth;
+
+        if (lineOrigin.x + rangeWidth > containerSizeWidth)
+        {
+            if (wrapWidth)
+            {
+                lineRange   = wrapRange;
+               _lineWidth   = wrapWidth;
+               _lineHeight  = wrapRange._height;
+               _lineBase    = wrapRange._base;
+            }
+
+            isNewline = YES;
+            isWordWrapped = YES;
+            glyphIndex = CPMaxRange(lineRange) - 1;  // start the line starts directly at current character
+        }
+
+        if (isNewline || isTabStop)
+        {
+            if ([self _flushRange:lineRange lineOrigin:lineOrigin currentContainer:_currentTextContainer advancements:advancements lineCount:numLines sameLine:!isNewline])
+                return;
+
+            if (isTabStop)
+            {
+               lineOrigin.x += rangeWidth;
+               isTabStop = NO;
+            }
+
+            if (isNewline)
+            {
+                if (currentParagraphMinimumLineHeight && currentParagraphMinimumLineHeight > _lineHeight)
+                    _lineHeight = currentParagraphMinimumLineHeight;
+
+                if (currentParagraphMaximumLineHeight && currentParagraphMaximumLineHeight < _lineHeight)
+                    _lineHeight = currentParagraphMaximumLineHeight;
+
+                lineOrigin.y += _lineHeight;
+
+                if (currentParagraphLineSpacing)
+                    lineOrigin.y += currentParagraphLineSpacing;
+
+                if (lineOrigin.y > containerSizeHeight && _indexOfCurrentContainer < textContainersCount - 1)
+                {
+                    _currentTextContainer = textContainers[++_indexOfCurrentContainer];
+                    containerSize = [_currentTextContainer containerSize];
+                    containerSizeWidth = containerSize.width;
+                    containerSizeHeight = containerSize.height;
+                }
+
+                lineOrigin.x = 0;
+                numLines++;
+                isNewline = NO;
+                _lineFragments = [];
+                _lineHeight    = 0;
+                _lineBase      = ascent;
+            }
+
+            _lineWidth      = 0;
+            advancements    = [];
+            currentAnchor   = 0;
+            prevRangeWidth  = 0;
+            lineRange       = CPMakeRange(glyphIndex + 1, 0);
+            measuringRange  = CPMakeRange(glyphIndex + 1, 0);
+            wrapRange       = CPMakeRange(0, 0);
+            wrapWidth       = 0;
+            isWordWrapped   = NO;
+        }
+    }
+
+    // this is to "flush" the remaining characters
+    if (lineRange.length)
+    {
+        [self _flushRange:lineRange lineOrigin:lineOrigin currentContainer:_currentTextContainer advancements:advancements lineCount:numLines sameLine:NO];
+    }
+
+    var rect = CGRectMake(0, lineOrigin.y, containerSizeWidth, [_layoutManager._lineFragments lastObject]._usedRect.size.height - descent);
+    [_layoutManager setExtraLineFragmentRect:rect usedRect:rect textContainer:_currentTextContainer];
+}
+
+@end

AppKit/CPTextView/_CPRTFParser.j

@@ -0,0 +1,791 @@
+/* RTFParser.j
+
+   Parse a RTF string into a CPAttributedString
+
+   Copyright (C) 2014 Daniel Boehringer
+
+FIXME: this class should be redone using a 'real' parser
+
+ * all paragraph spacing information is currently not parsed
+
+
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+*/
+
+@import <Foundation/CPAttributedString.j>
+@import <Foundation/CPGeometry.j>
+@import "CPFontManager.j"
+@import "CPParagraphStyle.j"
+
+@global CPLeftTextAlignment
+@global CPRightTextAlignment
+@global CPCenterTextAlignment
+@global CPJustifiedTextAlignment
+@global CPNaturalTextAlignment
+
+@global CPFontAttributeName
+@global CPForegroundColorAttributeName
+
+var hexTable = [];
+
+// Hold the attributes of the current run
+@implementation _RTFAttribute : CPObject
+{
+    CPRange             _range;
+    CPParagraphStyle    paragraph;
+    CPColor             fgColour;
+    CPColor             bgColour;
+    CPColor             ulColour;
+    CPString            fontName;
+    unsigned            fontSize;
+    BOOL                bold;
+    BOOL                italic;
+    BOOL                underline;
+    BOOL                strikethrough;
+    BOOL                script;
+    BOOL                _tabChanged;
+}
+
+- (id)init
+{
+    if (self = [super init])
+    {
+        [self resetFont];
+        [self resetParagraphStyle];
+        _range = CPMakeRange(0, 0);
+    }
+
+    return self;
+}
+
+- (id)copy
+{
+    var mynew =  [_RTFAttribute new];
+
+    mynew.paragraph = [paragraph copy];
+    mynew.fontName = fontName;
+    mynew.fgColour = fgColour;
+    mynew.bgColour = bgColour;
+    mynew.ulColour = ulColour;
+
+    return mynew;
+}
+
+- (CPFont)currentFont
+{
+    var font = [CPFont _fontWithName:fontName size:fontSize bold:bold italic:italic];
+
+    if (font)
+        return font;
+
+    //Before giving up and using a default font, we try if this is
+    //not the case of a font with a composite name, such as
+    //'Helvetica-Light'.  In that case, even if we don't have
+    //exactly an 'Helvetica-Light' font family, we might have an
+    //'Helvetica' one.
+    var range = [fontName rangeOfString:@"-"];
+
+    if (range.location != CPNotFound)
+    {
+        var fontFamily = [fontName substringToIndex: range.location];
+
+        font = [CPFont fontWithName:fontFamily size:fontSize];
+    }
+
+    /* Last resort, default font.  :-(  */
+    if (font == nil)
+        font = [CPFont systemFontOfSize:fontSize];
+
+    return font;
+}
+
+- (CPNumber)script
+{
+    return [CPNumber numberWithInt: script];
+}
+
+- (CPNumber)underline
+{
+    if (underline != 0)
+        return [CPNumber numberWithInteger: underline];
+    else
+        return nil;
+}
+
+- (CPNumber)strikethrough
+{
+    if (strikethrough != 0)
+        return [CPNumber numberWithInteger: strikethrough];
+    else
+        return nil;
+}
+
+- (void)resetParagraphStyle
+{
+    paragraph = [[CPParagraphStyle defaultParagraphStyle] copy];
+}
+
+- (void)resetFont
+{
+    var font = [CPFont systemFontOfSize:12];
+
+    fontName = [font familyName];
+    fontSize = 12.0;
+    italic = NO;
+    bold = NO;
+    underline = 0;
+    strikethrough = 0;
+    script = 0;
+}
+
+- (void)addTab:(float)location type:(CPTextTabType)type
+{
+    var tab = [[CPTextTab alloc] initWithType:CPLeftTabStopType
+                                     location:location];
+
+    if (!_tabChanged)
+    {
+        [paragraph setTabStops:[tab]];
+        _tabChanged = YES;
+    }
+    else
+    {
+        [paragraph addTabStop: tab];
+    }
+}
+
+- (CPDictionary)dictionary
+{
+    var ret = @{};
+    [ret setObject:[self currentFont] forKey:CPFontAttributeName];
+    [ret setObject:paragraph forKey:CPParagraphStyleAttributeName];
+
+    if (fgColour)
+        [ret setObject:fgColour forKey:CPForegroundColorAttributeName];
+
+    return ret;
+}
+@end
+
+
+// based on https://github.com/lazygyu/RTF-parser
+
+var kRTFParserType_char = 0,
+    kRTFParserType_dest = 1,
+    kRTFParserType_prop = 2,
+    kRTFParserType_spec = 3;
+
+// Keyword descriptions
+var kRgsymRtf = {
+                                             //  keyword     dflt    fPassDflt    kwd                        idx
+        "b"                                  : [ "b",        1,        false,     kRTFParserType_prop,    "propBold"],
+        "ul"                                 : [ "ul",       1,        false,     kRTFParserType_prop,    "propUnderline"],
+        "i"                                  : [ "i",        1,        false,     kRTFParserType_prop,    "propItalic"],
+        "li"                                 : [ "li",       0,        false,     kRTFParserType_prop,    "propPgnFormat"],
+        "pgnucltr"                           : [ "pgnucltr", "pgULtr", true,      kRTFParserType_prop,    "propPgnFormat"],
+        "pgnlcltr"                           : [ "pgnlcltr", "pgLLtr", true,      kRTFParserType_prop,    "propPgnFormat"],
+        "qc"                                 : [ "qc",       "justC",  true,      kRTFParserType_prop,    "propJust"],
+        "ql"                                 : [ "ql",       "justL",  true,      kRTFParserType_prop,    "propJust"],
+        "qr"                                 : [ "qr",       "justR",  true,      kRTFParserType_prop,    "propJust"],
+        "qj"                                 : [ "qj",       "justF",  true,      kRTFParserType_prop,    "propJust"],
+        "paperw"                             : [ "paperw",   12240,    false,     kRTFParserType_prop,    "propXaPage"],
+        "paperh"                             : [ "paperh",   15480,    false,     kRTFParserType_prop,    "propYaPage"],
+        "margl"                              : [ "margl",    1800,     false,     kRTFParserType_prop,    "propXaLeft"],
+        "margr"                              : [ "margr",    1800,     false,     kRTFParserType_prop,    "propXaRight"],
+        "margt"                              : [ "margt",    1440,     false,     kRTFParserType_prop,    "propYaTop"],
+        "margb"                              : [ "margb",    1440,     false,     kRTFParserType_prop,    "propYaBottom"],
+        "pgnstart"                           : [ "pgnstart", 1,        true,      kRTFParserType_prop,    "propPgnStart"],
+        "facingp"                            : [ "facingp",  1,        true,      kRTFParserType_prop,    "propFacingp"],
+        "landscape"                          : [ "landscape",1,        true,      kRTFParserType_prop,    "propLandscape"],
+        "par"                                : [ "par",      0,        false,     kRTFParserType_char,    "\n"],
+        "pard"                               : [ "pard",     0,        false,     kRTFParserType_prop,    "propDefaultPara"],
+        "\0x0a"                              : [ "\0x0a",    0,        false,     kRTFParserType_char,    "\n"],
+        "\0x0d"                              : [ "\0x0d",    0,        false,     kRTFParserType_char,    ""],
+        "tab"                                : [ "tab",      0,        false,     kRTFParserType_char,    "\t"],
+        "ldblquote"                          : [ "ldblquote",0,        false,     kRTFParserType_char,    '"'],
+        "rdblquote"                          : [ "rdblquote",0,        false,     kRTFParserType_char,    '"'],
+        "bin"                                : [ "bin",      0,        false,     kRTFParserType_spec,    "ipfnBin"],
+        "*"                                  : [ "*",        0,        false,     kRTFParserType_spec,    "ipfnDestSkip"],
+        "'"                                  : [ "'",        0,        false,     kRTFParserType_spec,    "ipfnHex"],
+        "author"                             : [ "author",   0,        false,     kRTFParserType_dest,    "destSkip"],
+        "buptim"                             : [ "buptim",   0,        false,     kRTFParserType_dest,    "destSkip"],
+        "colortbl"                           : [ "colortbl", 0,        false,     kRTFParserType_dest,    "destSkip"],
+        "comment"                            : [ "comment",  0,        false,     kRTFParserType_dest,    "destSkip"],
+        "creatim"                            : [ "creatim",  0,        false,     kRTFParserType_dest,    "destSkip"],
+        "doccomm"                            : [ "doccomm",  0,        false,     kRTFParserType_dest,    "destSkip"],
+        "fonttbl"                            : [ "fonttbl",  0,        false,     kRTFParserType_dest,    "destSkip"],
+        "footer"                             : [ "footer",   0,        false,     kRTFParserType_dest,    "destSkip"],
+        "footerf"                            : [ "footerf",  0,        false,     kRTFParserType_dest,    "destSkip"],
+        "footerl"                            : [ "footerl",  0,        false,     kRTFParserType_dest,    "destSkip"],
+        "footerr"                            : [ "footerr",  0,        false,     kRTFParserType_dest,    "destSkip"],
+        "footnote"                           : [ "footnote", 0,        false,     kRTFParserType_dest,    "destSkip"],
+        "ftncn"                              : [ "ftncn",    0,        false,     kRTFParserType_dest,    "destSkip"],
+        "ftnsep"                             : [ "ftnsep",   0,        false,     kRTFParserType_dest,    "destSkip"],
+        "ftnsepc"                            : [ "ftnsepc",  0,        false,     kRTFParserType_dest,    "destSkip"],
+        "fprq"                               : [ "fprq",     0,        false,     kRTFParserType_dest,    "destSkip"],
+//      "fcharset"                           : [ "fcharset", 0,        false,     kRTFParserType_dest,    "destSkip"],
+        "rquote"                             : [ "rquote",   0,        false,     kRTFParserType_char,    "'"],
+//      "s"                                  : [ "s",        0,        false,     kRTFParserType_dest,    "destSkip"],
+        "header"                             : [ "header",   0,        false,     kRTFParserType_dest,    "destSkip"],
+        "headerf"                            : [ "headerf",  0,        false,     kRTFParserType_dest,    "destSkip"],
+        "headerl"                            : [ "headerl",  0,        false,     kRTFParserType_dest,    "destSkip"],
+        "headerr"                            : [ "headerr",  0,        false,     kRTFParserType_dest,    "destSkip"],
+        "info"                               : [ "info",     0,        false,     kRTFParserType_dest,    "destSkip"],
+        "keywords"                           : [ "keywords", 0,        false,     kRTFParserType_dest,    "destSkip"],
+        "operator"                           : [ "operator", 0,        false,     kRTFParserType_dest,    "destSkip"],
+        "pict"                               : [ "pict",     0,        false,     kRTFParserType_dest,    "destSkip"],
+        "printim"                            : [ "printim",  0,        false,     kRTFParserType_dest,    "destSkip"],
+        "private1"                           : [ "private1", 0,        false,     kRTFParserType_dest,    "destSkip"],
+        "revtim"                             : [ "revtim",   0,        false,     kRTFParserType_dest,    "destSkip"],
+        "rxe"                                : [ "rxe",      0,        false,     kRTFParserType_dest,    "destSkip"],
+        "stylesheet"                         : [ "stylesheet",0,       false,     kRTFParserType_dest,    "destSkip"],
+        "subject"                            : [ "subject",  0,        false,     kRTFParserType_dest,    "destSkip"],
+        "tc"                                 : [ "tc",       0,        false,     kRTFParserType_dest,    "destSkip"],
+        "title"                              : [ "title",    0,        false,     kRTFParserType_dest,    "destSkip"],
+        "txe"                                : [ "txe",      0,        false,     kRTFParserType_dest,    "destSkip"],
+        "xe"                                 : [ "xe",       0,        false,     kRTFParserType_dest,    "destSkip"],
+        "["                                  : [ "[",        0,        false,     kRTFParserType_char,    '['],
+        " "                                  : [ " ",        0,        false,     kRTFParserType_char,    ' '],
+        "]"                                  : [ "]",        0,        false,     kRTFParserType_char,    ']'],
+        "{"                                  : [ "{",        0,        false,     kRTFParserType_char,    '{'],
+        "}"                                  : [ "}",        0,        false,     kRTFParserType_char,    '}'],
+        "\\"                                 : [ "\\",       0,        false,     kRTFParserType_char,    '\\']
+    };
+
+@implementation _CPRTFParser : CPObject
+{
+    CPString            _codePage;
+    CGSize              _paper;
+    CPString            _rtf;
+    unsigned            _curState;
+    CPArray             _states;
+    unsigned            _currentParseIndex;
+    BOOL                _hexreturn;
+    _RTFAttribute       _currentRun;
+    CPAttributedString  _result;
+    CPArray             _colorArray;
+    CPArray             _fontArray;
+    CPString            _freename;
+    BOOL                _parsingFontTable;
+}
+
+- (id)init
+{
+    if (self = [super init])
+    {
+        _paper              = CPMakeSize(0, 0);
+        _rtf                = "";
+        _curState           = 0;                // 0 = normal, 1 = skip
+        _states             = [];
+        _currentParseIndex  = 0;
+        _hexreturn          = NO;
+        _result             = [CPAttributedString new];
+        _colorArray         = [];
+        _fontArray          = ['Arial'];   // FIXME: should be name of system font
+        _freename           = "";
+        _parsingFontTable   = NO;
+    }
+
+    return self;
+}
+
+- (CPString)_checkChar:(CPArray)sym parameter:(CPString)ch
+{
+    switch (_curState)
+    {
+        case 0:
+            if (sym && sym[4])
+                return sym[4];
+
+        case 1:
+            // CPLogConsole("skipped : " + sym[4]);
+            return '';
+
+        default:
+            if (sym && sym[4])
+                return sym[4];
+     }
+}
+
+- (BOOL)pushState
+{
+    _states.push["group"];
+    return YES;
+}
+
+- (BOOL)popState
+{
+    _states.pop();
+
+    if (_curState > 0)
+        _curState--;
+
+    return YES;
+}
+
+- (CPString)_parseSpec:(CPArray)sym parameter:(CPString)v
+{
+    var ch = '';
+
+    switch (sym[4])
+    {
+        case "ipfnDestSkip":
+            _curState++;
+            return '';
+
+        case "ipfnHex":
+            ch = _rtf.charAt(++_currentParseIndex);
+
+            var hex = '';
+
+            while (/[a-fA-F0-9\']/.test(ch))
+            {
+                if (ch == "'")
+                {
+                    _currentParseIndex++;
+                    continue;
+                }
+
+                hex += (ch + '');
+                ch = _rtf.charAt(++_currentParseIndex);
+            }
+            //ch = parseInt(ch, 16);
+            //console.log("hex : " + hex);
+            _hexreturn = YES;
+            _currentParseIndex--;
+
+            if (_curState !== 0)
+               return '';
+            else
+                return hex;
+            break;
+
+         case "codePage":
+             ch = _rtf.charAt(++_currentParseIndex);
+
+             var code = '';
+
+             while (/[0-9]/.test(ch))
+             {
+                 code += (ch + '');
+                 ch = _rtf.charAt(++_currentParseIndex);
+             }
+
+             _codePage = code;
+             _currentParseIndex--;
+             break;
+    }
+
+    return '';
+}
+
+- (void)_flushCurrentRun
+{
+    var newOffset = 0;
+
+    if (_currentRun)
+    {
+        if ([_result length] == _currentRun._range.location)
+            return;
+
+        _currentRun._range.length = [_result length] - _currentRun._range.location;
+        newOffset = CPMaxRange(_currentRun._range);
+
+        var dict = [_currentRun dictionary];
+
+        [_result setAttributes:dict range:_currentRun._range];  // flush previous run
+        _currentRun.fgColour = [CPColor blackColor];
+    }
+    else
+        _currentRun = [_RTFAttribute new];
+
+    _currentRun._range = CPMakeRange(newOffset, 0);  // open a new one
+}
+
+- (CPString)_applyPropChange:sym parameter:param
+{
+    //console.log("prop : " + sym[0] + " / param : " + param+ ' ');
+
+    switch (sym[0])
+    {
+        case "pard":
+            [self _flushCurrentRun];
+            break;
+
+        case "b": // bold
+            if (param === 0)
+            {
+                if (_currentRun && _currentRun.bold)
+                   [self _flushCurrentRun];
+
+                _currentRun.bold = NO
+            }
+            else
+            {
+                if (_currentRun && !_currentRun.bold)
+                    [self _flushCurrentRun];
+
+               _currentRun.bold = YES;
+            }
+
+            break;
+
+        case "i": // italic
+            if (param === 0)
+            {
+                if (_currentRun && _currentRun.italic)
+                   [self _flushCurrentRun];
+
+                _currentRun.italic = NO
+            }
+            else
+            {
+               if (_currentRun && !_currentRun.italic)
+                  [self _flushCurrentRun];
+
+               _currentRun.italic = YES;
+            }
+
+            break;
+
+        case "qc":  // paragraph center
+            [_currentRun.paragraph setAlignment:CPCenterTextAlignment];
+            break;
+
+        case "paperw":
+            _paper.width = param;
+            break;
+
+        case "paperh":
+            _paper.height = param;
+            break;
+    }
+
+    return '';
+}
+
+
+- (CPString)_changeDest:(CPArray)sym
+{
+    switch (sym[0])
+    {
+        case "colortbl":
+            _colorArray.push([CPColor blackColor]);
+            break;
+
+        case "fonttbl":
+            _parsingFontTable = YES;
+            break;
+    }
+
+    if (sym[4] == "destSkip")
+    {
+        CPLogConsole("Dest skip start : [" + sym[0] + "]");
+        _curState++;
+    }
+
+    return '';
+}
+
+- (CPString)_translateKeyword:(CPString)keyword parameter:(CPString)param fParameter:(BOOL)fParam
+{
+    if (kRgsymRtf[keyword] !== undefined)
+    {
+        var sym = kRgsymRtf[keyword];
+
+        switch (sym[3])
+        {
+            case kRTFParserType_prop:
+                if (sym[2]  || !fParam)
+                    param = sym[1];
+
+                return [self _applyPropChange:sym parameter:param];
+
+            case kRTFParserType_char:
+                if((param + '') !== 'NaN' && (param + '').length)
+                    _currentParseIndex -= (param + '').length;
+
+                return [self _checkChar:sym parameter:param];
+
+            case kRTFParserType_dest:
+                return [self _changeDest:sym];
+
+            case kRTFParserType_spec:
+                return [self _parseSpec:sym parameter:param];
+
+            default:
+                return '';
+        }
+    }
+    else
+    {
+        switch (keyword)
+        {
+            case "red":
+                var oldColor = [_colorArray lastObject],
+                    green = [oldColor greenComponent],
+                    blue = [oldColor blueComponent];
+
+                _colorArray.pop();
+                _colorArray.push([CPColor colorWithRed:parseInt(param) / 255 green:green blue:blue alpha:1.0]);
+                break;
+
+            case "green":
+                var oldColor = [_colorArray lastObject],
+                    red = [oldColor redComponent],
+                    blue = [oldColor blueComponent];
+
+                _colorArray.pop();
+                _colorArray.push([CPColor colorWithRed:red green: parseInt(param) / 255 blue:blue alpha:1.0]);
+                break;
+
+            case "blue":
+                var oldColor = [_colorArray lastObject],
+                    green = [oldColor greenComponent],
+                    red = [oldColor redComponent];
+
+                _colorArray.pop();
+                _colorArray.push([CPColor colorWithRed:red green:green blue:parseInt(param) / 255 alpha:1.0]);
+                _colorArray.push([CPColor blackColor]); // placeholder for next color
+                break;
+
+            case "cf":  // change foreground color
+                 [self _flushCurrentRun];
+                 var fontIndex = parseInt(param) - 1;
+
+                 if (_currentRun && fontIndex >= 0)
+                     _currentRun.fgColour = _colorArray[fontIndex];
+
+                break;
+
+            case "f":  // change font
+                 [self _flushCurrentRun];
+                 var fontIndex = parseInt(param);
+
+                 if (_currentRun && fontIndex >= 0 && fontIndex < _fontArray.length)
+                     _currentRun.fontName = _fontArray[fontIndex];
+                 break;
+
+            case "fs":  // change font size
+                 [self _flushCurrentRun];
+                 _currentRun.fontSize = parseInt(param) / 2;
+                 break;
+
+            case "tx":  // tabstop
+                 var location = parseInt(param) / 20;
+
+                 if (_currentRun)
+                     [_currentRun addTab:location type:CPLeftTabStopType];
+
+                 break;
+
+            default:
+               CPLogConsole("skip : " + keyword + " param: " + param);
+
+        }
+
+        if (_states.length > 0)
+            _curState = 1;
+
+        return '';
+    }
+}
+
+- (CPString)_parseKeyword:(CPString)rtf length:(unsigned)len
+{
+    var ch = '',
+        fParam = false,
+        fNeg = false,
+        keyword = '',
+        param = '';
+
+    _rtf = rtf;
+
+    if (++_currentParseIndex >= len)
+        return len;
+
+    ch = rtf.charAt(_currentParseIndex);
+
+    if (!/[a-zA-Z]/.test(ch))
+        return [self _translateKeyword:ch parameter:nil fParameter:fParam];
+
+    while (/[a-zA-Z]/.test(ch))
+    {
+        keyword += ch;
+        ch = rtf.charAt(++_currentParseIndex);
+    }
+
+    if (ch == '-')
+    {
+        fNeg = true;
+        ch = rtf.charAt(++_currentParseIndex);
+    }
+
+    fParam = true;
+
+    while (/[0-9]/.test(ch))
+    {
+        param += (ch + '');
+        ch = rtf.charAt(++_currentParseIndex);
+    }
+
+    _currentParseIndex--;
+    param = parseInt(param);
+
+    if (fNeg)
+        param *= -1;
+
+    return [self _translateKeyword:keyword parameter:param fParameter:fParam];
+}
+
+- (void)_appendPlainString:(CPString) aString
+{
+    [_result replaceCharactersInRange:CPMakeRange([_result length], 0) withString:aString];
+
+}
+- (CPAttributedString)parseRTF:(CPString)rtf
+{
+    if (rtf.length == 0)
+        return '';
+
+    _currentParseIndex = -1;
+
+    var len = rtf.length,
+        tmp = '',
+        ch = '',
+        hex = '',
+        lastchar = 0;
+
+    while (_currentParseIndex < len)
+    {
+        tmp = rtf.charAt(++_currentParseIndex);
+
+        if (tmp !== "\\" && hex.length > 0)
+        {
+            [self _appendPlainString: String.fromCharCode(parseInt((hex), 16))];
+            hex = '';
+        }
+
+        switch (tmp)
+        {
+            case " ":
+                if (lastchar == 1)
+                {
+                    lastchar = 0;
+                }
+                else
+                {
+                    _freename += tmp;
+                   [self _appendPlainString:tmp];
+                }
+
+                break;
+
+            case "{":
+                if ([self pushState])
+                    CPLogConsole("push");
+
+                break;
+
+            case "}":
+                if ([self popState])
+                    CPLogConsole("pop");
+
+                if (_freename)
+                {
+                    CPLogConsole(_freename);
+
+                    if (_parsingFontTable)
+                    {
+                         _fontArray.push(_freename);
+                         _parsingFontTable = NO;
+                    }
+
+                    _freename = "";
+                }
+
+                [self _flushCurrentRun]
+                break;
+
+            case "\\":
+                _freename = '';
+                ch = [self _parseKeyword:rtf length:len];
+
+                if (!_hexreturn && ch.length == 0)
+                    lastchar = 1;
+                else
+                    lastchar = 0;
+
+                if (_hexreturn)
+                {
+                    if (ch.length > 0)
+                    {
+                        if (parseInt(ch, 16) & 0x80)
+                        {
+                            hex += ch.toUpperCase();
+                        }
+                        else
+                        {
+                            [self _appendPlainString: String.fromCharCode(parseInt((hex + ch), 16))];
+                            hex = '';
+                        }
+
+                        if (hex.length == 4)
+                        {
+                            var temp = parseInt(hex, 16);
+
+                            if (hexTable && hexTable[hex.toUpperCase()] !== undefined)
+                                temp = parseInt(hexTable[hex.toUpperCase()], 16);
+
+                            [self _appendPlainString: String.fromCharCode(temp)]
+                            hex = '';
+                        }
+                    }
+                    else
+                    {
+                        CPLogConsole("hex skipped");
+                    }
+
+                    _hexreturn = NO;
+                }
+                else if (ch !== undefined && _curState === 0)
+                {
+                    [self _appendPlainString:ch];
+                }
+
+                break;
+
+            case 0x0d:
+            case 0x0a:
+            case '\n':
+            case '\r':
+                break;
+
+            default:
+                lastchar = 0;
+
+                if (_curState == 0)
+                    [self _appendPlainString:tmp];
+                else if (tmp !== ';')
+                    _freename += tmp;
+
+                break;
+        }
+    }
+
+    return _result;
+}
+
+@end

AppKit/CPTextView/_CPRTFProducer.j

@@ -0,0 +1,615 @@
+/*
+   RTFProducer.j
+
+   Serialize CPAttributedString to a RTF String
+
+   Copyright (C) 2014 Daniel Boehringer
+   This file is based on the RTFProducer from GNUStep
+   (which i co-authored with Fred Kiefer in 1999)
+
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/CPAttributedString.j>
+@import "CPParagraphStyle.j"
+@import "CPColor.j"
+@import "CPGraphics.j"
+@import "CPFontManager.j"
+
+@global CPForegroundColorAttributeName
+@global CPBackgroundColorAttributeName
+@global CPUnderlineStyleAttributeName
+@global CPSuperscriptAttributeName
+@global CPBaselineOffsetAttributeName
+@global CPAttachmentAttributeName
+@global CPLigatureAttributeName
+@global CPKernAttributeName
+
+@global CPLeftTextAlignment
+@global CPRightTextAlignment
+@global CPCenterTextAlignment
+@global CPJustifiedTextAlignment
+@global CPNaturalTextAlignment
+
+var PAPERSIZE = @"PaperSize",
+    LEFTMARGIN = @"LeftMargin",
+    RIGHTMARGIN = @"RightMargin",
+    TOPMARGIN = @"TopMargin",
+    BUTTOMMARGIN = @"ButtomMargin";
+
+function _points2twips(a) { return (a) * 20.0; }
+
+@implementation _CPRTFProducer : CPObject
+{
+    CPAttributedString  text;
+    CPMutableDictionary fontDict;
+    CPMutableDictionary colorDict;
+    CPDictionary        docDict;
+    CPMutableArray      attachments;
+    CPFont              currentFont;
+    CPColor             fgColor;
+    CPColor             bgColor;
+    CPColor             ulColor;
+}
+
+#pragma mark -
+#pragma mark Class methods
+
+
++ (CPString)produceRTF:(CPAttributedString)aText documentAttributes:(CPDictionary)dict
+{
+    var mynew = [self new];
+
+    return [mynew RTFDStringFromAttributedString:aText documentAttributes:dict];
+}
+
+
+#pragma mark -
+#pragma mark init methods
+
+- (id)init
+{
+    if (self = [super init])
+    {
+        // maintain a dictionary for the used colours
+        // (for rtf-header generation)
+        colorDict = [CPMutableDictionary new];
+
+        //maintain a dictionary for the used fonts
+        //(for rtf-header generation)
+        fontDict = [CPMutableDictionary new];
+
+        fgColor = [CPColor blackColor];
+        bgColor= [CPColor whiteColor];
+    }
+
+    return self;
+}
+
+// private stuff follows
+- (CPString)fontTable
+{
+    if (![fontDict count])
+        return @"";
+
+    var fontlistString = "",
+        fontEnum,
+        currFont,
+        keyArray;
+
+    keyArray = [fontDict allKeys];
+    keyArray = [keyArray sortedArrayUsingSelector:@selector(compare:)];
+    fontEnum = [keyArray objectEnumerator];
+
+    while ((currFont = [fontEnum nextObject]) !== nil)
+    {
+        var fontFamily,
+            detail;
+
+        if ([currFont isEqualToString:@"Symbol"])
+            fontFamily = @"tech";
+        else if ([currFont isEqualToString:@"Helvetica"])
+            fontFamily = @"swiss";
+        else if ([currFont isEqualToString:@"Arial"])
+            fontFamily = @"swiss";
+        else if ([currFont isEqualToString:@"Courier"])
+            fontFamily = @"modern";
+        else if ([currFont isEqualToString:@"Times"])
+            fontFamily = @"roman";
+        else fontFamily = @"nil";
+
+        detail = [CPString stringWithFormat:@"%@\\f%@ %@;", [fontDict objectForKey:currFont], fontFamily, currFont];
+        fontlistString += detail;
+    }
+
+    return [CPString stringWithFormat:@"{\\fonttbl%@}\n", fontlistString];
+}
+
+- (CPString)colorTable
+{
+    if (![colorDict count])
+        return @"";
+
+    var result,
+        count = [colorDict count],
+        list = [CPMutableArray arrayWithCapacity:count],
+        keyEnum = [colorDict keyEnumerator],
+        next,
+        i;
+
+    while ((next = [keyEnum nextObject]) !== nil)
+    {
+        var cn = [colorDict objectForKey:next];
+        [list insertObject:[CPColor colorWithCSSString:next] atIndex:[cn intValue]-1];
+    }
+
+    result = [CPString stringWithString:@"{\\colortbl;"];
+
+    for (i = 0; i < count; i++)
+    {
+        var color = [[list objectAtIndex:i]
+                           colorUsingColorSpaceName:CPCalibratedRGBColorSpace];
+
+        result += [CPString stringWithFormat:@"\\red%d\\green%d\\blue%d;",
+                                             ([color redComponent] * 255),
+                                             ([color greenComponent] * 255),
+                                             ([color blueComponent] * 255)];
+    }
+
+    result += @"}\n";
+
+    return result;
+}
+
+- (CPString)documentAttributes
+{
+    if (!docDict)
+        return @"";
+
+    var result,
+        detail,
+        val,
+        num;
+
+    result = [CPString string];
+
+    val = [docDict objectForKey:PAPERSIZE];
+
+    if (val)
+    {
+        var size = [val sizeValue];
+
+        detail = [CPString stringWithFormat:@"\\paperw%d \\paperh%d",
+                         _points2twips(size.width),
+                         _points2twips(size.height)];
+
+        result += detail;
+    }
+
+    num = [docDict objectForKey:LEFTMARGIN];
+
+    if (num)
+    {
+        var f = [num floatValue];
+
+        detail = [CPString stringWithFormat:@"\\margl%d", _points2twips(f)];
+        result += detail;
+    }
+
+    num = [docDict objectForKey:RIGHTMARGIN];
+
+    if (num)
+    {
+        var f = [num floatValue];
+
+        detail = [CPString stringWithFormat:@"\\margr%d", _points2twips(f)];
+        result += detail;
+    }
+
+    num = [docDict objectForKey:TOPMARGIN];
+
+    if (num)
+    {
+        var f = [num floatValue];
+
+        detail = [CPString stringWithFormat:@"\\margt%d", _points2twips(f)];
+        result += detail;
+    }
+
+    num = [docDict objectForKey:BUTTOMMARGIN];
+
+    if (num)
+    {
+        var f = [num floatValue];
+
+        detail = [CPString stringWithFormat:@"\\margb%d", _points2twips(f)];
+        result += detail;
+    }
+
+    return result;
+}
+
+- (CPString)headerString
+{
+    var result;
+
+    result = [CPString stringWithString:@"{\\rtf1\\ansi"];
+    result += [self fontTable];
+    result += [self colorTable];
+    result += [self documentAttributes];
+
+    return result;
+}
+
+- (CPString)trailerString
+{
+    return @"}";
+}
+
+- (CPString)fontToken:(CPString) fontName
+{
+    var fCount = [fontDict objectForKey:fontName];
+
+    if (fCount == nil)
+    {
+        var count = [fontDict count];
+
+        fCount = [CPString stringWithFormat:@"\\f%d", count];
+        [fontDict setObject:fCount forKey:fontName];
+    }
+
+    return fCount;
+}
+
+- (int)numberForColor:(CPColor)color
+{
+    var num = [colorDict objectForKey:[color cssString]];
+
+    if (!num)
+        [colorDict setObject:num = [CPNumber numberWithInt:[colorDict count] + 1]
+		              forKey:[color cssString]];
+
+    return [num intValue];
+}
+
+- (CPString)paragraphStyle:(CPParagraphStyle)paraStyle
+{
+    var headerString = [CPString stringWithString:@"\\pard"],
+        twips;
+
+    if (paraStyle == nil)
+        return headerString;
+
+    switch ([paraStyle alignment])
+    {
+        case CPRightTextAlignment:
+            headerString += @"\\qr";
+            break;
+
+        case CPCenterTextAlignment:
+            headerString += @"\\qc";
+            break;
+
+        case CPLeftTextAlignment:
+            headerString += @"\\ql";
+            break;
+
+        case CPJustifiedTextAlignment:
+            headerString += @"\\qj";
+            break;
+
+        default:
+            headerString += @"\\ql";
+            break;
+    }
+
+    // write first line indent and left indent
+    var twips = _points2twips([paraStyle firstLineHeadIndent]);
+
+    if (twips != 0.0)
+        headerString += [CPString stringWithFormat:@"\\fi%d", twips];
+
+    twips = _points2twips([paraStyle headIndent]);
+
+    if (twips != 0.0)
+        headerString += [CPString stringWithFormat:@"\\li%d", twips];
+
+    twips = _points2twips([paraStyle tailIndent]);
+
+    if (twips != 0.0)
+        headerString += [CPString stringWithFormat:@"\\ri%d", twips];
+
+    twips = _points2twips([paraStyle paragraphSpacing]);
+
+    if (twips != 0.0)
+        headerString += [CPString stringWithFormat:@"\\sa%d", twips];
+
+    twips = _points2twips([paraStyle minimumLineHeight]);
+
+    if (twips != 0.0)
+        headerString += [CPString stringWithFormat:@"\\sl%d", twips];
+
+    twips = _points2twips([paraStyle maximumLineHeight]);
+
+    if (twips != 0.0)
+        headerString += [CPString stringWithFormat:@"\\sl-%d", twips];
+
+    var enumerator,
+        tab;
+
+    enumerator = [[paraStyle tabStops] objectEnumerator];
+
+    while ((tab = [enumerator nextObject]))
+    {
+        switch ([tab tabStopType])
+        {
+            case CPLeftTabStopType:
+            // no tabkind emission needed
+                break;
+/*              case NSRightTabStopType:
+                headerString += @"\\tqr";
+            break;
+            case NSCenterTabStopType:
+               headerString += @"\\tqc";
+            break;
+            case NSDecimalTabStopType:
+                headerString += @"\\tqdec";
+            break;
+            default:
+                NSLog(@"Unknown tab stop type.");
+*/
+          }
+
+          headerString += [CPString stringWithFormat:@"\\tx%d",_points2twips([tab location])];
+    }
+
+    return headerString;
+}
+
+- (CPString)runStringForString:(CPString) substring
+                    attributes:(CPDictionary) attributes
+                paragraphStart:(BOOL) first
+{
+    var result = "",
+        headerString = "",
+        trailerString = "",
+        attribEnum,
+        currAttrib;
+
+    if (first)
+    {
+        var paraStyle = [attributes objectForKey:CPParagraphStyleAttributeName];
+        headerString += [self paragraphStyle:paraStyle];
+    }
+
+  /*
+   * analyze attributes of current run
+   *
+   * FIXME: All the character attributes should be output relative to the font
+   * attributes of the paragraph. So if the paragraph has underline on it should
+   * still be possible to switch it off for some characters, which currently is
+   * not possible.
+   */
+    attribEnum = [attributes keyEnumerator];
+
+    while ((currAttrib = [attribEnum nextObject]) != nil)
+    {
+        if ([currAttrib isEqualToString:CPFontAttributeName])
+        {
+          /*
+           * handle fonts
+           */
+            var font,
+                fontName,
+                traits;
+
+            font = [attributes objectForKey:CPFontAttributeName];
+            fontName = [font familyName];
+            traits = [[CPFontManager sharedFontManager] traitsOfFont:font];
+
+          /*
+           * font name
+           */
+            if (currentFont == nil || ![fontName isEqualToString:[currentFont familyName]])
+                headerString += [self fontToken:fontName];
+
+          /*
+           * font size
+           */
+            if (currentFont == nil || [font size] != [currentFont size])
+            {
+                var points = [font size] * 2,
+                    pString;
+
+                pString = [CPString stringWithFormat:@"\\fs%d", points];
+                headerString += pString;
+            }
+          /*
+           * font attributes
+           */
+            if (traits & CPItalicFontMask)
+            {
+                headerString += @"\\i";
+                trailerString += @"\\i0";
+            }
+
+            if (traits & CPBoldFontMask)
+            {
+                headerString += @"\\b";
+                trailerString += @"\\b0";
+            }
+
+            if (first)
+                currentFont = font;
+        }
+        else if ([currAttrib isEqualToString:CPForegroundColorAttributeName])
+        {
+            var color = [attributes objectForKey:CPForegroundColorAttributeName];
+
+            if (![color isEqual:fgColor])
+            {
+                headerString += [CPString stringWithFormat:@"\\cf%d", [self numberForColor:color]];
+                trailerString += @"\\cf0";
+            }
+        }
+        else if ([currAttrib isEqualToString:CPBackgroundColorAttributeName])
+        {
+            var color = [attributes objectForKey:CPBackgroundColorAttributeName];
+
+            if (![color isEqual:bgColor])
+            {
+                headerString += [CPString stringWithFormat:@"\\cb%d", [self numberForColor:color]];
+                trailerString += @"\\cb0";
+            }
+        }
+        else if ([currAttrib isEqualToString:CPUnderlineStyleAttributeName])
+        {
+            headerString += @"\\ul";
+            trailerString += @"\\ulnone";
+        }
+        else if ([currAttrib isEqualToString:CPSuperscriptAttributeName])
+        {
+            var value = [attributes objectForKey:CPSuperscriptAttributeName],
+                svalue = [value intValue] * 6;
+
+            if (svalue > 0)
+            {
+                headerString += [CPString stringWithFormat:@"\\up%d", svalue];
+                trailerString += @"\\up0";
+            }
+            else if (svalue < 0)
+            {
+                headerString += [CPString stringWithFormat:@"\\dn-%d", svalue];
+                trailerString += @"\\dn0";
+            }
+        }
+        else if ([currAttrib isEqualToString:CPBaselineOffsetAttributeName])
+        {
+            var value = [attributes objectForKey:CPBaselineOffsetAttributeName],
+                svalue = [value floatValue] * 2;
+
+            if (svalue > 0)
+            {
+                headerString += [CPString stringWithFormat:@"\\up%d", svalue];
+                trailerString += @"\\up0";
+            }
+            else if (svalue < 0)
+            {
+                headerString += [CPString stringWithFormat:@"\\dn-%d", svalue];
+                trailerString += @"\\dn0";
+            }
+        }
+        else if ([currAttrib isEqualToString:CPAttachmentAttributeName])
+        {
+        }
+        else if ([currAttrib isEqualToString:CPLigatureAttributeName])
+        {
+        }
+        else if ([currAttrib isEqualToString:CPKernAttributeName])
+        {
+        }
+    }
+
+    substring = substring.replace(/\\/g, '\\\\');
+    substring = substring.replace(/\n/g, '\\par\n');
+    substring = substring.replace(/\t/g, '\\tab');
+    substring = substring.replace(/{/g, '\\{');
+    substring = substring.replace(/}/g, '\\}');
+    // FIXME: All characters not in the standard encoding must be
+    // replaced by \'xx
+
+    if (!first)
+    {
+        var braces;
+
+        if ([headerString length])
+             braces = [CPString stringWithFormat:@"{%@ %@}", headerString, substring];
+        else
+             braces = substring;
+
+        result += braces;
+    }
+    else
+    {
+        var nobraces;
+
+        if ([headerString length])
+            nobraces = [CPString stringWithFormat:@"%@ %@", headerString, substring];
+        else
+            nobraces = substring;
+
+        result += nobraces;
+    }
+
+    return result + trailerString;
+}
+
+- (CPString)bodyString
+{
+    var string = [text string],
+        result = "",
+        loc = 0,
+        length = [string length],
+        currRange = CPMakeRange(loc, 0),
+        completeRange = CPMakeRange(0, length),
+        first = YES;
+
+    // FIXME <!> split along newline characters and run as outer loop
+    while (CPMaxRange(currRange) < CPMaxRange(completeRange))  // save all "runs"
+    {
+        var attributes,
+            substring,
+            runString;
+
+        attributes = [text attributesAtIndex:CPMaxRange(currRange)
+                       longestEffectiveRange:currRange
+                                     inRange:completeRange];
+        substring = [string substringWithRange:currRange];
+        runString = [self runStringForString:substring
+                                  attributes:attributes
+                              paragraphStart:YES];
+
+        result += runString;
+        first = NO;
+    }
+
+    return result;
+}
+
+
+- (CPString)RTFDStringFromAttributedString:(CPAttributedString)aText
+                        documentAttributes:(CPDictionary)dict
+{
+    var output = [CPString string],
+        headerString,
+        trailerString,
+        bodyString;
+
+    text = aText;
+    docDict = dict;
+
+  /*
+   * do not change order! (esp. body has to be generated first; builds context)
+   */
+    bodyString = [self bodyString];
+    trailerString = [self trailerString];
+    headerString = [self headerString];
+
+    output += headerString;
+    output += bodyString;
+    output += trailerString;
+    return output;
+}
+@end

AppKit/CPView.j

@@ -416,7 +416,7 @@ var CPViewHighDPIDrawingEnabled = YES;
 */
 - (void)setToolTip:(CPString)aToolTip
 {
-    if (_toolTip == aToolTip)
+    if (_toolTip === aToolTip)
         return;
 
     if (aToolTip && ![aToolTip isKindOfClass:CPString])
@@ -574,7 +574,7 @@ var CPViewHighDPIDrawingEnabled = YES;
     [[self window] _dirtyKeyViewLoop];
 
     // If this is already one of our subviews, remove it.
-    if (aSubview._superview == self)
+    if (aSubview._superview === self)
     {
         var index = [_subviews indexOfObjectIdenticalTo:aSubview];
 
@@ -863,7 +863,7 @@ var CPViewHighDPIDrawingEnabled = YES;
 
     do
     {
-        if (view == aView)
+        if (view === aView)
             return YES;
     } while(view = [view superview])
 
@@ -978,7 +978,7 @@ var CPViewHighDPIDrawingEnabled = YES;
 
 - (CPView)viewWithTag:(CPInteger)aTag
 {
-    if ([self tag] == aTag)
+    if ([self tag] === aTag)
         return self;
 
     var index = 0,
@@ -1030,7 +1030,7 @@ var CPViewHighDPIDrawingEnabled = YES;
         [[self superview] viewFrameChanged:[[CPNotification alloc] initWithName:CPViewFrameDidChangeNotification object:self userInfo:nil]];
 
     if (!_inhibitUpdateTrackingAreas)
-        [self _updateTrackingAreas];
+        [self _updateTrackingAreasWithRecursion:YES];
 }
 
 /*!
@@ -1103,7 +1103,7 @@ var CPViewHighDPIDrawingEnabled = YES;
 #endif
 
     if (!_inhibitUpdateTrackingAreas && !_inhibitFrameAndBoundsChangedNotifications)
-        [self _updateTrackingAreas];
+        [self _updateTrackingAreasWithRecursion:YES];
 }
 
 /*!
@@ -1257,7 +1257,7 @@ var CPViewHighDPIDrawingEnabled = YES;
         [[self superview] viewFrameChanged:[[CPNotification alloc] initWithName:CPViewFrameDidChangeNotification object:self userInfo:nil]];
 
     if (!_inhibitUpdateTrackingAreas && !_inhibitFrameAndBoundsChangedNotifications)
-        [self _updateTrackingAreas];
+        [self _updateTrackingAreasWithRecursion:!_autoresizesSubviews];
 }
 
 /*!
@@ -1306,7 +1306,7 @@ var CPViewHighDPIDrawingEnabled = YES;
         [[self superview] viewBoundsChanged:[[CPNotification alloc] initWithName:CPViewBoundsDidChangeNotification object:self userInfo:nil]];
 
     if (!_inhibitUpdateTrackingAreas)
-        [self _updateTrackingAreas];
+        [self _updateTrackingAreasWithRecursion:YES];
 }
 
 /*!
@@ -1374,7 +1374,7 @@ var CPViewHighDPIDrawingEnabled = YES;
         [[self superview] viewBoundsChanged:[[CPNotification alloc] initWithName:CPViewBoundsDidChangeNotification object:self userInfo:nil]];
 
     if (!_inhibitUpdateTrackingAreas && !_inhibitFrameAndBoundsChangedNotifications)
-        [self _updateTrackingAreas];
+        [self _updateTrackingAreasWithRecursion:YES];
 }
 
 /*!
@@ -1418,7 +1418,7 @@ var CPViewHighDPIDrawingEnabled = YES;
         [[self superview] viewBoundsChanged:[[CPNotification alloc] initWithName:CPViewBoundsDidChangeNotification object:self userInfo:nil]];
 
     if (!_inhibitUpdateTrackingAreas && !_inhibitFrameAndBoundsChangedNotifications)
-        [self _updateTrackingAreas];
+        [self _updateTrackingAreasWithRecursion:YES];
 }
 
 
@@ -1430,7 +1430,7 @@ var CPViewHighDPIDrawingEnabled = YES;
 {
     var mask = [self autoresizingMask];
 
-    if (mask == CPViewNotSizable)
+    if (mask === CPViewNotSizable)
         return;
 
     var frame = _superview._frame,
@@ -1611,7 +1611,7 @@ var CPViewHighDPIDrawingEnabled = YES;
         {
             do
             {
-               if (self == view)
+               if (self === view)
                {
                   [_window makeFirstResponder:[self nextValidKeyView]];
                   break;
@@ -1737,7 +1737,7 @@ var CPViewHighDPIDrawingEnabled = YES;
 */
 - (void)setAlphaValue:(float)anAlphaValue
 {
-    if (_opacity == anAlphaValue)
+    if (_opacity === anAlphaValue)
         return;
 
     _opacity = anAlphaValue;
@@ -1936,10 +1936,10 @@ var CPViewHighDPIDrawingEnabled = YES;
 */
 - (void)setBackgroundColor:(CPColor)aColor
 {
-    if (_backgroundColor == aColor)
+    if (_backgroundColor === aColor)
         return;
 
-    if (aColor == [CPNull null])
+    if (aColor === [CPNull null])
         aColor = nil;
 
     _backgroundColor = aColor;
@@ -1982,7 +1982,7 @@ var CPViewHighDPIDrawingEnabled = YES;
             var image = slices[i],
                 size = [image size];
 
-            if (!size || (size.width == 0 && size.height == 0))
+            if (!size || (size.width === 0 && size.height === 0))
                 size = nil;
 
             _DOMImageSizes[i] = size;
@@ -2037,10 +2037,12 @@ var CPViewHighDPIDrawingEnabled = YES;
             CPDOMDisplayServerSetStyleSize(_DOMImageParts[0], size.width, size.height);
         }
         else
+        {
             _DOMElement.style.background = colorCSS;
 
             if (patternImage)
                 CPDOMDisplayServerSetStyleBackgroundSize(_DOMElement, [patternImage size].width + "px", [patternImage size].height + "px");
+        }
     }
     else
     {
@@ -2074,7 +2076,7 @@ var CPViewHighDPIDrawingEnabled = YES;
             partIndex++;
         }
 
-        if (_backgroundType == BackgroundNinePartImage)
+        if (_backgroundType === BackgroundNinePartImage)
         {
             var left = _DOMImageSizes[0] ? _DOMImageSizes[0].width : 0,
                 right = _DOMImageSizes[2] ? _DOMImageSizes[2].width : 0,
@@ -2135,7 +2137,7 @@ var CPViewHighDPIDrawingEnabled = YES;
                 CPDOMDisplayServerSetStyleRightBottom(_DOMImageParts[partIndex], NULL, 0.0, 0.0);
             }
         }
-        else if (_backgroundType == BackgroundVerticalThreePartImage)
+        else if (_backgroundType === BackgroundVerticalThreePartImage)
         {
             var top = _DOMImageSizes[0] ? _DOMImageSizes[0].height : 0,
                 bottom = _DOMImageSizes[2] ? _DOMImageSizes[2].height : 0;
@@ -2167,7 +2169,7 @@ var CPViewHighDPIDrawingEnabled = YES;
                 CPDOMDisplayServerSetStyleSize(_DOMImageParts[partIndex], frameSize.width, bottom);
             }
         }
-        else if (_backgroundType == BackgroundHorizontalThreePartImage)
+        else if (_backgroundType === BackgroundHorizontalThreePartImage)
         {
             var left = _DOMImageSizes[0] ? _DOMImageSizes[0].width : 0,
                 right = _DOMImageSizes[2] ? _DOMImageSizes[2].width : 0;
@@ -2906,8 +2908,8 @@ setBoundsOrigin:
     return YES;
 }
 
-/*
-    FIXME Not yet implemented
+/*!
+    Scrolls the view’s CPClipView in the direction of a mouse event that occurs outside of it.
 */
 - (BOOL)autoscroll:(CPEvent)anEvent
 {
@@ -3129,7 +3131,7 @@ setBoundsOrigin:
 */
 - (void)setLayer:(CALayer)aLayer
 {
-    if (_layer == aLayer)
+    if (_layer === aLayer)
         return;
 
     if (_layer)
@@ -3590,21 +3592,21 @@ setBoundsOrigin:
     [_trackingAreas removeObjectIdenticalTo:trackingArea];
 }
 
-- (void)_updateTrackingAreas
+- (void)_updateTrackingAreasWithRecursion:(BOOL)shouldCallRecursively
 {
     _inhibitUpdateTrackingAreas = YES;
 
-    [self _recursivelyUpdateTrackingAreas];
-
-    _inhibitUpdateTrackingAreas = NO;
-}
-
-- (void)_recursivelyUpdateTrackingAreas
-{
     [self _updateTrackingAreasForOwners:[self _calcTrackingAreaOwners]];
 
-    for (var i = 0; i < _subviews.length; i++)
-        [_subviews[i] _recursivelyUpdateTrackingAreas];
+    if (shouldCallRecursively)
+    {
+        // Now, call _updateTrackingAreasWithRecursion on subviews
+
+        for (var i = 0; i < _subviews.length; i++)
+            [_subviews[i] _updateTrackingAreasWithRecursion:YES];
+    }
+
+    _inhibitUpdateTrackingAreas = NO;
 }
 
 - (CPArray)_calcTrackingAreaOwners

AppKit/CPWindow/CPWindow.j

@@ -4098,6 +4098,9 @@ var interpolate = function(fromValue, toValue, progress)
             [overlappingTrackingAreas addObject:aTrackingArea];
     }
 
+    if (overlappingTrackingAreas.length === 0)
+        return;
+
     var frontmostTrackingArea = overlappingTrackingAreas[0],
         frontmostView         = [frontmostTrackingArea view];
 

AppKit/CoreAnimation/CPAnimationContext.j

@@ -163,9 +163,13 @@ CPLog.debug(_cmd + "context stack =" + _CPAnimationContextStack);
     {
         if (needsFrameTimer)
             [self stopFrameUpdaterWithIdentifier:objectId];
-        else if (animationCompletion)
+
+        if (animationCompletion)
             animationCompletion();
 
+        if (needsFrameTimer || animationCompletion)
+            [[CPRunLoop currentRunLoop] performSelectors];
+
         if (_completionHandlerAgent)
             _completionHandlerAgent.decrement();
     };
@@ -289,7 +293,7 @@ CPLog.debug(_cmd + "context stack =" + _CPAnimationContextStack);
             cssAnimations.push(cssAnimation);
         }
 
-        var css_mapping = [[aTargetView class] cssPropertiesForKeyPath:keyPath];
+        var css_mapping = [[aTargetView class] _cssPropertiesForKeyPath:keyPath];
 
         [css_mapping enumerateObjectsUsingBlock:function(aDict, anIndex, stop)
         {
@@ -299,9 +303,6 @@ CPLog.debug(_cmd + "context stack =" + _CPAnimationContextStack);
 
             cssAnimation.addPropertyAnimation(property, getter, duration, anAction.keytimes, anAction.values, timingFunctions, completionFunction);
         }];
-
-        if (needsFrameTimer)
-            cssAnimation.setRemoveAnimationPropertyOnCompletion(false);
     }
 
     if (needsFrameTimer)
@@ -611,46 +612,42 @@ CFRunLoopRemoveObserver = function(runloop, observer, mode)
 var FrameUpdater = function(anIdentifier)
 {
     this._identifier = anIdentifier;
+    this._requestId = null;
     this._duration = 0;
     this._stop = false;
     this._targets = [];
     this._callbacks = [];
+
     var frameUpdater = this;
 
     this._updateFunction = function(timestamp)
     {
+        if (frameUpdater._startDate == null)
+            frameUpdater._startDate = timestamp;
+
         if (frameUpdater._stop)
             return;
 
-        if (this._startDate == null)
-            this._startDate = timestamp;
-
         for (var i = 0; i < frameUpdater._callbacks.length; i++)
             frameUpdater._callbacks[i]();
 
-        if (timestamp - this._startDate < frameUpdater._duration * 1000)
+        if (timestamp - frameUpdater._startDate < frameUpdater._duration * 1000)
             window.requestAnimationFrame(frameUpdater._updateFunction);
     };
 };
 
 FrameUpdater.prototype.start = function()
 {
-    window.requestAnimationFrame(this._updateFunction);
+    this._requestId = window.requestAnimationFrame(this._updateFunction);
 };
 
 FrameUpdater.prototype.stop = function()
 {
-CPLog.debug("stop FrameUpdater with id " + this.identifier());
+    // window.cancelAnimationFrame support is Chrome 24, Firefox 23, IE 10, Opera 15, Safari 6.1
+    if (window.cancelAnimationFrame)
+        window.cancelAnimationFrame(this._requestId);
 
     this._stop = true;
-
-    var targets = this._targets;
-
-    for (var i = 0; i < targets.length; i++)
-    {
-        CPLog.debug(targets[i] + " Remove animation-name property");
-        targets[i]._DOMElement.style.removeProperty(CPBrowserCSSProperty("animation-name"));
-    }
 };
 
 FrameUpdater.prototype.updateFunction = function()

AppKit/CoreAnimation/CPViewAnimator.j

@@ -6,35 +6,6 @@
 {
 }
 
-- (void)viewWillMoveToSuperview:(CPView)aSuperview
-{
-    var orderInAnim = [self animationForKey:@"CPAnimationTriggerOrderIn"];
-
-    if (orderInAnim && [orderInAnim isKindOfClass:[CAPropertyAnimation class]])
-    {
-        [_target setValue:[orderInAnim fromValue] forKeyPath:[orderInAnim keyPath]];
-    }
-
-    [_target viewWillMoveToSuperview:aSuperview];
-}
-
-- (void)viewDidMoveToSuperview
-{
-    var orderInAnim = [self animationForKey:@"CPAnimationTriggerOrderIn"];
-
-    if (orderInAnim && [orderInAnim isKindOfClass:[CAPropertyAnimation class]])
-    {
-        [self _setTargetValue:YES withKeyPath:@"CPAnimationTriggerOrderIn" fallback:nil completion:function()
-        {
-            [_target setValue:[orderInAnim toValue] forKeyPath:[orderInAnim keyPath]];
-        }];
-    }
-    else
-    {
-        [_target viewDidMoveToSuperview];
-    }
-}
-
 - (void)removeFromSuperview
 {
     [self _setTargetValue:nil withKeyPath:@"CPAnimationTriggerOrderOut" setter:_cmd];
@@ -139,7 +110,7 @@ var DEFAULT_CSS_PROPERTIES = nil;
 
 @implementation CPView (CPAnimatablePropertyContainer)
 
-+ (CPDictionary)defaultCSSProperties
++ (CPDictionary)_defaultCSSProperties
 {
     if (DEFAULT_CSS_PROPERTIES == nil)
     {
@@ -160,9 +131,9 @@ var DEFAULT_CSS_PROPERTIES = nil;
     return DEFAULT_CSS_PROPERTIES;
 }
 
-+ (CPArray)cssPropertiesForKeyPath:(CPString)aKeyPath
++ (CPArray)_cssPropertiesForKeyPath:(CPString)aKeyPath
 {
-    return [[self defaultCSSProperties] objectForKey:aKeyPath];
+    return [[self _defaultCSSProperties] objectForKey:aKeyPath];
 }
 
 + (Class)animatorClass
@@ -190,7 +161,14 @@ var DEFAULT_CSS_PROPERTIES = nil;
 
 + (CAAnimation)defaultAnimationForKey:(CPString)aKey
 {
-    if ([self cssPropertiesForKeyPath:aKey] !== nil)
+    // TODO: remove when supported.
+    if (aKey == @"CPAnimationTriggerOrderIn")
+    {
+        CPLog.warn("CPView animated key path CPAnimationTriggerOrderIn is not supported yet.");
+        return nil;
+    }
+
+    if ([self _cssPropertiesForKeyPath:aKey] !== nil)
         return [CAAnimation animation];
 
     return nil;
@@ -219,4 +197,4 @@ var DEFAULT_CSS_PROPERTIES = nil;
     _animationsDictionary = [animationsDict copy];
 }
 
-@end
+@end

AppKit/CoreAnimation/CSSAnimation.j

@@ -51,7 +51,6 @@ CSSAnimation = function(aTarget/*DOM Element*/, anIdentifier)
         this.animationsdurations = [];
         this.islive = false;
         this.didBuildDOMElements = false;
-        this.removeAnimationPropertyOnCompletion = true;
 
         animation = this;
         CURRENT_ANIMATIONS[anIdentifier] = animation;
@@ -177,21 +176,21 @@ CSSAnimation.prototype.endEventListener = function()
             if (idx !== -1)
                 inFlightAnimationsNames.splice(idx, 1);
 
-            if (inFlightAnimationsNames.length == 0)
+            if (inFlightAnimationsNames.length > 0)
+                return;
+
+            for (var i = 0; i < animationsNames.length; i++)
             {
-                for (var i = 0; i < animationsNames.length; i++)
-                {
-                    var completion = animation.completionFunctionForAnimationName(animationsNames[i]);
-                    if (completion)
-                        completion();
-                }
+                var completion = animation.completionFunctionForAnimationName(animationsNames[i]);
+                if (completion)
+                    completion();
+            }
 
-                var eventTarget = event.target,
-                    style = eventTarget.style;
-
-                if (animation.removeAnimationPropertyOnCompletion)
-                    style.removeProperty(ANIMATION_NAME_PROPERTY);
+            var eventTarget = event.target,
+                style = eventTarget.style;
 
+            try {
+                style.removeProperty(ANIMATION_NAME_PROPERTY);
                 style.removeProperty(ANIMATION_DURATION_PROPERTY);
                 style.removeProperty(ANIMATION_FILL_MODE_PROPERTY);
                 style.removeProperty("-webkit-backface-visibility");
@@ -204,6 +203,8 @@ CSSAnimation.prototype.endEventListener = function()
                 eventTarget.removeEventListener(ANIMATION_END_EVENT_NAME, AnimationEndListener);
                 animation.listener = null;
                 delete (CURRENT_ANIMATIONS[animation.identifier]);
+            } catch (err) {
+                CPLog.warn("CSSAnimation.j - " + err);
             }
         };
 
@@ -260,11 +261,6 @@ CSSAnimation.prototype.buildDOMElements = function()
     this.didBuildDOMElements = true;
 }
 
-CSSAnimation.prototype.setRemoveAnimationPropertyOnCompletion = function(flag)
-{
-    this.removeAnimationPropertyOnCompletion = flag;
-}
-
 CSSAnimation.prototype.start = function()
 {
     if (this.propertyanimations.length == 0 || this.islive)

AppKit/CoreGraphics/CGContext.j

@@ -24,6 +24,7 @@
 @import "CPCompatibility.j"
 @import "CGGeometry.j"
 @import "CGPath.j"
+@import "CGContextText.j"
 
 @typedef CGContext
 

AppKit/CoreGraphics/CGContextText.j

@@ -0,0 +1,86 @@
+/*
+ * CGContextText.j
+ * CoreText
+ *
+ * Created by Nicholas Small.
+ * Copyright 2011, 280 North, Inc.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+kCGTextFill = 0;
+kCGTextStroke = 1;
+kCGTextFillStroke = 2;
+kCGTextInvisible = 3;
+
+function CGContextGetTextMatrix(/* CGContext */ aContext)
+{
+    return aContext._textMatrix;
+}
+
+function CGContextSetTextMatrix(/* CGContext */ aContext, /* CGAffineTransform */ aTransform)
+{
+    aContext._textMatrix = aTransform;
+}
+
+function CGContextGetTextPosition(/* CGContext */ aContext)
+{
+    return aContext._textPosition || _CGPointMakeZero();
+}
+
+function CGContextSetTextPosition(/* CGContext */ aContext, /* float */ x, /* float */ y)
+{
+    aContext._textPosition = CGPointMake(x, y);
+}
+
+function CGContextGetFont(/* CGContext */ aContext)
+{
+    return aContext._CPFont;
+}
+
+function CGContextSelectFont(/* CGContext */ aContext, /* CPFont */ aFont)
+{
+    aContext.font = [aFont cssString];
+    aContext._CPFont = aFont;
+}
+
+function CGContextSetTextDrawingMode(/* CGContext */ aContext, /* CGTextDrawingMode */ aMode)
+{
+    aContext._textDrawingMode = aMode;
+}
+
+function CGContextShowText(/* CGContext */ aContext, /* CPString */ aString)
+{
+    CGContextShowTextAtPoint(aContext, aContext._textPosition.x, aContext._textPosition.y, aString);
+}
+
+function CGContextShowTextAtPoint(/* CGContext */ aContext, /* float */ x, /* float */ y, /* CPString */ aString)
+{
+    aContext.textBaseline = @"middle";
+    aContext.textAlign = @"left";
+    
+    var mode = aContext._textDrawingMode;
+    if (!mode && mode !== 0)
+        mode = kCGTextFill;
+    
+    var width = aContext.measureText(aString).width;
+    
+    if (mode === kCGTextFill || mode === kCGTextFillStroke)
+        aContext.fillText(aString, x, y);
+    if (mode === kCGTextStroke || mode === kCGTextFillStroke)
+        aContext.strokeText(aString, x, y);
+    
+    aContext._textPosition = CGPointMake(x + width, y);
+}

AppKit/Platform/DOM/CPPlatformPasteboard.j

@@ -384,9 +384,10 @@ Return true if the event may be a copy and paste event, but the target is not an
 
     if ([value length])
     {
-        var pasteboard = [CPPasteboard generalPasteboard];
+        var pasteboard = [CPPasteboard generalPasteboard],
+            cappString = [pasteboard stringForType:CPStringPboardType];
 
-        if ([pasteboard _stateUID] != value)
+        if (cappString != value)
         {
             [pasteboard declareTypes:[CPStringPboardType] owner:self];
             [pasteboard setString:value forType:CPStringPboardType];
@@ -450,9 +451,10 @@ Return true if the event may be a copy and paste event, but the target is not an
 
     if ([value length])
     {
-        var pasteboard = [CPPasteboard generalPasteboard];
+        var pasteboard = [CPPasteboard generalPasteboard],
+            cappString = [pasteboard stringForType:CPStringPboardType];
 
-        if ([pasteboard _stateUID] != value)
+        if (cappString != value)
         {
             [pasteboard declareTypes:[CPStringPboardType] owner:self];
             [pasteboard setString:value forType:CPStringPboardType];

AppKit/Platform/DOM/CPPlatformString.j

@@ -171,7 +171,9 @@ var DOMFixedWidthSpanElement    = nil,
         span.style.width = ROUND(aWidth) + "px";
     }
 
-    span.style.font = [(aFont || DefaultFont) cssString];
+    var effectiveFontCSSString = [(aFont || DefaultFont) cssString];
+    if (span.style.font !== effectiveFontCSSString)
+        span.style.font = effectiveFontCSSString;
 
     if (CPFeatureIsCompatible(CPJavaScriptInnerTextFeature))
         span.innerText = aString;

AppKit/Themes/Aristo/ThemeDescriptors.j

@@ -389,8 +389,11 @@ var themedButtonValues = nil,
     var color = [CPColor blackColor],
         themedColorValues =
     [
-        [@"alternate-selected-control-color", [[CPColor alloc] _initWithRGBA:[0.22, 0.46, 0.84, 1.0]]],
-        [@"secondary-selected-control-color", [[CPColor alloc] _initWithRGBA:[0.83, 0.83, 0.83, 1.0]]]
+        [@"alternate-selected-control-color",        [[CPColor alloc] _initWithRGBA:[0.22, 0.46, 0.84, 1.0]]],
+        [@"secondary-selected-control-color",        [[CPColor alloc] _initWithRGBA:[0.83, 0.83, 0.83, 1.0]]],
+        [@"selected-text-background-color",          [CPColor colorWithHexString:"99CCFF"]],
+        [@"selected-text-inactive-background-color", [CPColor colorWithHexString:"CCCCCC"]]
+
     ];
 
     [self registerThemeValues:themedColorValues forObject:color];

AppKit/Themes/Aristo2/ThemeDescriptors.j

@@ -106,8 +106,10 @@ var themedButtonValues = nil,
     var color = [CPColor redColor],
         themedColorValues =
     [
-        [@"alternate-selected-control-color", [[CPColor alloc] _initWithRGBA:[0.22, 0.46, 0.84, 1.0]]],
-        [@"secondary-selected-control-color", [[CPColor alloc] _initWithRGBA:[0.83, 0.83, 0.83, 1.0]]]
+        [@"alternate-selected-control-color",        [[CPColor alloc] _initWithRGBA:[0.22, 0.46, 0.84, 1.0]]],
+        [@"secondary-selected-control-color",        [[CPColor alloc] _initWithRGBA:[0.83, 0.83, 0.83, 1.0]]],
+        [@"selected-text-background-color",          [CPColor colorWithHexString:"99CCFF"]],
+        [@"selected-text-inactive-background-color", [CPColor colorWithHexString:"CCCCCC"]]
     ];
 
     [self registerThemeValues:themedColorValues forObject:color];

Foundation/CPCache.j

@@ -64,7 +64,7 @@ var CPCacheDelegate_cache_willEvictObject_ = 1 << 1;
 {
     CPDictionary            _items;
     int                     _currentPosition;
-    BOOL                    _totalCostCache;
+    int                     _totalCostCache;
     unsigned                _implementedDelegateMethods;
 
     CPString                _name               @accessors(property=name);
@@ -374,4 +374,4 @@ var CPCacheDelegate_cache_willEvictObject_ = 1 << 1;
     return cacheItem;
 }
 
-@end
+@end

Tests/AppKit/CPTabViewTest.j

@@ -138,4 +138,16 @@
     [self assert:[_tabView selectedTabViewItem] equals:_tabItem2];
 }
 
+- (void)testTabViewItemSelectionNotEmpty
+{
+    // after insertion from empty and no explicit selection.
+    [self assert:[_tabView numberOfTabViewItems] equals:2];
+    [self assert:[_tabView selectedTabViewItem] equals:_tabItem1];
+
+    // Removes selected Item.
+    [_tabView removeTabViewItem:_tabItem1];
+    [self assert:[_tabView numberOfTabViewItems] equals:1];
+    [self assert:[_tabView selectedTabViewItem] equals:_tabItem2];
+}
+
 @end

Tests/AppKit/CPTextViewTest.j

@@ -0,0 +1,87 @@
+@import <AppKit/CPTextView.j>
+@import <OJMoq/OJMoq.j>
+
+@implementation CPTextViewTest : OJTestCase
+{
+    CPWindow    theWindow;
+    CPTextView  textView;
+
+    CPString    stringValue;
+
+    OJMoqSpy    delegateSpy
+}
+
+- (void)setUp
+{
+    // This will init the global var CPApp which are used internally in the AppKit
+    [[CPApplication alloc] init];
+
+    // setup a reasonable table
+    theWindow = [[CPWindow alloc] initWithContentRect:CGRectMake(0.0, 0.0, 1024.0, 768.0) styleMask:CPWindowNotSizable];
+
+    textView = [[CPTextView alloc] initWithFrame:CGRectMake(0,0,300,300)];
+
+    stringValue = @"My string  is here";
+
+    [textView setString:stringValue];
+    [textView setDelegate:self];
+
+    [[theWindow contentView] addSubview:textView];
+
+    delegateSpy = spy(self);
+}
+
+- (void)tearDown
+{
+    [delegateSpy reset];
+}
+
+- (void)testMakeCPTextViewInstance
+{
+    [self assertNotNull:textView];
+}
+
+- (void)testTextViewSetStringMethod
+{
+    [self assert:stringValue equals:[textView stringValue]];
+}
+
+- (void)testTextViewSelectionRange
+{
+    //TODO : uncomment once ojtest will be up to date on travis
+    var range;
+    //
+    //[delegateSpy selector:@selector(textView:willChangeSelectionFromCharacterRange:toCharacterRange:) times:1 arguments:[textView, CPMakeRange(0,0), CPMakeRange(0, 18)]];
+    //[delegateSpy selector:@selector(textViewDidChangeSelection:) times:1];
+    //[textView selectAll:self];
+    //range = [[textView selectedRanges] firstObject];
+    //[self assert:0 equals:range.location];
+    //[self assert:18 equals:range.length];
+    // [delegateSpy verifyThatAllExpectationsHaveBeenMet];
+    //
+    //
+    // [delegateSpy reset];
+    // [delegateSpy selector:@selector(textView:willChangeSelectionFromCharacterRange:toCharacterRange:) times:1 arguments:[textView, CPMakeRange(0, 18), CPMakeRange(3, 6)]];
+    // [delegateSpy selector:@selector(textViewDidChangeSelection:) times:1];
+    //[textView setSelectedRange:CPMakeRange(3, 6)];
+    //range = [[textView selectedRanges] firstObject];
+    //[self assert:3 equals:range.location];
+    //[self assert:6 equals:range.length];
+    // [delegateSpy verifyThatAllExpectationsHaveBeenMet];
+}
+
+@end
+
+@implementation CPTextViewTest (CPTextViewTestDelegate)
+
+- (CPRange)textView:(CPTextView)aTextView willChangeSelectionFromCharacterRange:(CPRange)oldSelectedCharRange toCharacterRange:(CPRange)newSelectedCharRange
+{
+    return newSelectedCharRange;
+}
+
+- (void)textViewDidChangeSelection:(CPNotification)aNotification
+{
+
+}
+
+@end

Tests/CucumberTests/CPAnimationContextTest/AppController.j

@@ -0,0 +1,228 @@
+/*
+ * AppController.j
+ * AdvancedHelloWorld
+ *
+ * Created by You on December 8, 2011.
+ * Copyright 2011, Your Company All rights reserved.
+ */
+/*
+    This Cucapp tests the following:
+        • CPAnimationContext -setCompletionHandler: is called and the end value is correct when the frame of a view is animated.
+            Tested for a vanilla view (no drawing, no layout), a view with custom drawing, with custom layout, with both.
+        • CPAnimationContext CPView special keyPaths CPAnimationTriggerOrderIn and CPAnimationTriggerOrderOut.
+            Checks that adding or removing the animator to/from the superview does not throw an error and the superview final value is correct.
+*/
+
+@import <Foundation/CPObject.j>
+
+@import "CPResponder+Cucapp.j"
+
+@class ColorView
+
+var ANIMATION_DURATION = 0.9;
+
+@implementation AppController : CPObject
+{
+    /* this "outlet" is connected automatically by the Cib */
+    CPWindow    theWindow;
+
+    /* We create the outlets of the textfields here */
+    @outlet DrawView         drawView;
+    @outlet CustomLayoutView layoutView;
+    @outlet CustomLayoutDrawView layoutDrawView;
+
+    CPInteger testNumber;
+    CPString passed;
+}
+
+- (void)awakeFromCib
+{
+    [theWindow setFullPlatformWindow:YES];
+    [layoutView setNeedsLayout];
+    [layoutDrawView setNeedsLayout];
+    testNumber = 0;
+    passed = "";
+}
+
+- (void)testDidPass
+{
+    passed = "true";
+    testNumber++;
+}
+
+- (IBAction)test:(id)sender
+{
+    passed = "false";
+    [self performSelector:CPSelectorFromString("test" + testNumber)];
+}
+
+- (void)test0
+{
+    vanillaView = [[ColorView alloc] initWithFrame:CGRectMake(30,30,148,115)];
+    [vanillaView setBackgroundColor:[vanillaView color]];
+
+    var fadeOut = [CABasicAnimation animationWithKeyPath:@"alphaValue"];
+    [fadeOut setFromValue:1];
+    [fadeOut setToValue:0];
+    [fadeOut setDuration:ANIMATION_DURATION];
+
+    [vanillaView setAnimations:@{@"CPAnimationTriggerOrderOut":fadeOut}];
+
+    var ctx = [CPAnimationContext currentContext];
+    [ctx setCompletionHandler:function()
+    {
+        if ([vanillaView superview] == [theWindow contentView] && [vanillaView alphaValue] == 1)
+            [self testDidPass];
+    }];
+
+    [[theWindow contentView] addSubview:vanillaView];
+}
+
+- (void)test1
+{
+    [self move:vanillaView];
+}
+
+- (void)test2
+{
+    [self move:drawView];
+}
+
+- (void)test3
+{
+    [self move:layoutView];
+}
+
+- (void)test4
+{
+    [self move:layoutDrawView];
+}
+
+- (void)test5
+{
+    var ctx = [CPAnimationContext currentContext];
+    [ctx setCompletionHandler:function()
+    {
+        if ([vanillaView superview] == nil && [vanillaView alphaValue] == 1)
+            [self testDidPass];
+    }];
+
+    [[vanillaView animator] removeFromSuperview];
+}
+
+- (void)move:(CPView)view
+{
+    var destinationRect = CGRectMake(200 *testNumber,200,200,200);
+    var ctx = [CPAnimationContext currentContext];
+    [ctx setDuration:ANIMATION_DURATION];
+    [ctx setCompletionHandler:function()
+    {
+        if (CGRectEqualToRect([view frame], destinationRect))
+            [self testDidPass];
+    }];
+
+    [[view animator] setFrame:destinationRect];
+}
+
+@end
+
+
+@implementation ColorView : CPView
+{
+    CPColor color @accessors;
+}
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    self = [super initWithFrame:aFrame];
+
+    color = [CPColor randomColor];
+
+    return self;
+}
+
+- (void)viewDidMoveToSuperview
+{
+    [self setBackgroundColor:color];
+}
+
+@end
+
+@implementation DrawView : CPView
+{
+    CPColor color;
+}
+
+- (id)initWithFrame:(CGRect)aFrame
+{
+    self = [super initWithFrame:aFrame];
+
+    color = [CPColor randomColor];
+
+    return self;
+}
+
+- (void)drawRect:(CGRect)aRect
+{
+    var context = [[CPGraphicsContext currentContext] graphicsPort],
+        bounds = [self bounds];
+
+    CGContextSetLineWidth(context, 2);
+    CGContextSetStrokeColor(context, [CPColor blackColor]);
+    CGContextSetFillColor(context, color);
+
+    CGContextBeginPath(context);
+    CGContextFillRect(context, bounds);
+
+    var height = CGRectGetHeight(bounds),
+        width = CGRectGetWidth(bounds);
+
+    CGContextStrokeLineSegments(context, [CGPointMake(10,0), CGPointMake(10, height),
+                                          CGPointMake(0, 10), CGPointMake(CGRectGetWidth(aRect), 10),
+                                          CGPointMake(width - 10, 0), CGPointMake(width - 10, height),
+                                          CGPointMake(0, height - 10), CGPointMake(width, height - 10)], 8);
+}
+
+@end
+
+@implementation CustomLayoutView : ColorView
+{
+}
+
+- (void)layoutSubviews
+{
+    [self setBackgroundColor:color];
+
+    var subviews = [self subviews],
+        count = [subviews count] - 1;
+
+    var dx = (CGRectGetWidth([self frame]) - 100) / count,
+        dy = (CGRectGetHeight([self frame]) - 26) / count
+
+    [subviews enumerateObjectsUsingBlock:function(view, idx, stop)
+    {
+        [view setFrameOrigin:CGPointMake(dx * idx, dy * idx)];
+    }];
+}
+
+@end
+
+@implementation CustomLayoutDrawView : DrawView
+{
+}
+
+- (void)layoutSubviews
+{
+    var subviews = [self subviews],
+        count = [subviews count] - 1;
+
+    var dx = (CGRectGetWidth([self frame]) - 100) / count,
+        dy = (CGRectGetHeight([self frame]) - 26) / count
+
+    [subviews enumerateObjectsUsingBlock:function(view, idx, stop)
+    {
+        [view setFrameOrigin:CGPointMake(dx * idx, dy * idx)];
+    }];
+}
+
+@end

Tests/CucumberTests/CPAnimationContextTest/CPResponder+CuCapp.j

@@ -0,0 +1,94 @@
+/*
+* Copyright (c) 2014 Nuage Networks
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy
+* of this software and associated documentation files (the "Software"), to deal
+* in the Software without restriction, including without limitation the rights
+* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+* copies of the Software, and to permit persons to whom the Software is
+* furnished to do so, subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in
+* all copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+* THE SOFTWARE.
+*/
+
+
+// Import this Categories from your application
+// You can now user -(void)setCucappIdentifier: and -(CPString)cucappIdentifier
+// to set and get your cucapp IDs.
+// Then from a test, you can use it as a selector like //CPView[cucappIdentifier="my-button"]
+
+@import <AppKit/CPResponder.j>
+@import <AppKit/CPMenuItem.j>
+
+@implementation CPResponder (cucappAdditions)
+
+- (void)setCucappIdentifier:(CPString)anIdentifier
+{
+    self.__cucappIdentifier = anIdentifier;
+}
+
+- (CPString)cucappIdentifier
+{
+    return self.__cucappIdentifier;
+}
+
+@end
+
+@implementation CPMenuItem (cucappAdditionsMenu)
+
+- (void)setCucappIdentifier:(CPString)anIdentifier
+{
+    [[self _menuItemView] setCucappIdentifier:anIdentifier];
+}
+
+- (CPString)cucappIdentifier
+{
+    [[self _menuItemView] cucappIdentifier];
+}
+
+@end
+
+function load_cucapp_CLI(path)
+{
+    if (!path)
+        path = "Cucapp/lib/Cucumber.j"
+
+    try {
+        objj_importFile(path, true, function() {
+            [Cucumber stopCucumber];
+            CPLog.debug("Cucapp CLI has been well loaded");
+            _addition_cpapplication_send_event_method();
+        });
+
+    }
+    catch(e)
+    {
+        [CPException raise:CPInvalidArgumentException reason:@"Invalid path for the lib Cucumber"];
+    }
+}
+
+
+function load_cucapp_record(path)
+{
+    if (!path)
+        path = "CuCapp+Record.j"
+
+    try {
+        objj_importFile(path, true, function() {
+            CPLog.debug("Cucapp record has been well loaded");
+        });
+    }
+    catch(e)
+    {
+        [CPException raise:CPInvalidArgumentException reason:@"Invalid path for the lib Cucapp+Record.j"];
+    }
+}

Tests/CucumberTests/CPAnimationContextTest/CuCapp+Record.j

@@ -0,0 +1,591 @@
+@import <AppKit/CPApplication.j>
+
+function start_record(path)
+{
+    [CPWindow start_record];
+}
+
+function stop_record()
+{
+    [CPWindow stop_record];
+}
+
+function save_record(fileName)
+{
+    if (!fileName)
+        fileName = @"record"
+
+    var eventRecords =  [CPWindow eventRecords],
+        JSONEvents = [];
+
+    for (var i = 0; i < [eventRecords count]; i++)
+    {
+        var eventRecord = eventRecords[i];
+        [JSONEvents addObject:[eventRecord objectToJSON]];
+    }
+
+    var pom = document.createElement('a');
+    pom.setAttribute('href', 'data:text/plain;charset=utf-8,' + encodeURIComponent(JSON.stringify(JSONEvents, null, 4)));
+    pom.setAttribute('download', fileName + ".json");
+    pom.click();
+}
+
+function play_record(file_name, cucumber_path)
+{
+    if (!cucumber_path)
+        cucumber_path = path = "../../Cucapp/lib/Cucumber.j";
+
+    load_cucapp_CLI(cucumber_path);
+
+    setTimeout(function(){
+        _load_javascript_file(file_name)
+    },1000);
+}
+
+function _load_javascript_file(file_name)
+{
+    var AJAX_req = new XMLHttpRequest();
+    AJAX_req.open( "GET", file_name, true );
+    AJAX_req.setRequestHeader("Content-type", "application/json");
+
+    AJAX_req.onreadystatechange = function()
+    {
+        if (AJAX_req.readyState == 4)
+        {
+            var recordingEvents = JSON.parse(AJAX_req.responseText);
+
+            for (var i = 0; i < [recordingEvents count]; i++)
+            {
+                var recordingEvent = JSON.parse(recordingEvents[i]),
+                    type = recordingEvent["event"]["type"];
+
+                if (type == CPLeftMouseDown && i < [recordingEvents count] - 1)
+                {
+                    var nextRecordingEvent = JSON.parse(recordingEvents[i + 1]),
+                        nextType = nextRecordingEvent["event"]["type"];
+
+                    if (nextType == CPMouseMoved)
+                    {
+                        for (var j = i; j < [recordingEvents count]; j++)
+                        {
+                            var tmpRecordingEvent = JSON.parse(recordingEvents[j]),
+                                tmpType = tmpRecordingEvent["event"]["type"];
+
+                            if (tmpType == CPLeftMouseUp)
+                            {
+                                setTimeout(_simulate_drag_event, recordingEvent["event"]["timestamp"] * 1000, recordingEvent, tmpRecordingEvent);
+                                i = j;
+                                break;
+                            }
+                        }
+
+                        continue;
+                    }
+                }
+
+                setTimeout(_simulate_event, recordingEvent["event"]["timestamp"] * 1000, recordingEvent);
+            }
+        }
+    }
+
+    AJAX_req.send();
+}
+
+function _simulate_drag_event(event1, event2)
+{
+    var keyView1 = event1["keyView"],
+        valueView1 = event1["valueView"],
+        keyView2 = event2["keyView"],
+        valueView2 = event2["valueView"],
+        locationInWindow1 = CGPointMake(event1["event"]["locationInWindow"]["x"], event1["event"]["locationInWindow"]["y"]);
+        locationInWindow2 = CGPointMake(event2["event"]["locationInWindow"]["x"], event2["event"]["locationInWindow"]["y"]);
+
+        if (keyView1 && valueView1 && keyView2 && valueView2)
+            simulate_dragged_click_view_to_view(keyView1, valueView1, keyView2, valueView2);
+        else if (keyView1 && valueView1)
+            simulate_dragged_click_view_to_point(keyView1, valueView1, locationInWindow1.x, locationInWindow1.y);
+        else
+            simulate_dragged_click_point_to_point(locationInWindow1.x, locationInWindow1.y, locationInWindow2.x, locationInWindow2.y);
+}
+
+function _simulate_event(event)
+{
+    var type = event["event"]["type"],
+        keyView = event["keyView"],
+        valueView = event["valueView"],
+        characters = event["event"]["characters"],
+        deltaX = event["event"]["deltaX"],
+        deltaY = event["event"]["deltaY"],
+        deltaZ = event["event"]["deltaZ"],
+        deltaZ = event["event"]["deltaZ"],
+        locationInWindow = CGPointMake(event["event"]["locationInWindow"]["x"], event["event"]["locationInWindow"]["y"]);
+
+    switch (type)
+    {
+        case CPScrollWheel:
+
+            if (keyView && valueView)
+                simulate_scroll_wheel_on_view(keyView, valueView, deltaX, deltaY)
+
+            break;
+
+        case CPLeftMouseDown:
+
+            if (keyView && valueView)
+                simulate_left_click_on_view(keyView, valueView);
+            else
+                simulate_left_click_on_point(locationInWindow.x, locationInWindow.y)
+
+            break;
+
+        case CPRightMouseDown:
+
+            if (keyView && valueView)
+                simulate_right_click_on_view(keyView, valueView);
+            else
+                simulate_right_click_on_point(locationInWindow.x, locationInWindow.y)
+
+            break;
+
+        case CPKeyDown:
+            simulate_keyboard_event(characters);
+            break;
+    }
+}
+
+
+var eventRecords,
+    recording = NO;
+
+@implementation CPWindow (cucappRecord)
+
++ (CPArray)eventRecords
+{
+    return eventRecords;
+}
+
++ (void)start_record
+{
+    eventRecords = [];
+    recording = YES;
+}
+
++ (void)stop_record
+{
+    recording = NO;
+}
+
+/*!
+    Dispatches events that are sent to it from CPApplication.
+    @param anEvent the event to be dispatched
+*/
+- (void)sendEvent:(CPEvent)anEvent
+{
+    var type = [anEvent type],
+        sheet = [self attachedSheet],
+        recordingEvent = [[RecordingEvent alloc] initWithEvent:anEvent];
+
+    if (recordingEvent && type != CPFlagsChanged && type != CPMouseMoved)
+        [eventRecords addObject:recordingEvent];
+
+    // If a sheet is attached events get filtered here.
+    // It is not clear what events should be passed to the view, perhaps all?
+    // CPLeftMouseDown is needed for window moving and resizing to work.
+    // CPMouseMoved is needed for rollover effects on title bar buttons.
+
+    if (sheet)
+    {
+        switch (type)
+        {
+            case CPLeftMouseDown:
+
+                // This is needed when a doubleClick occurs when the sheet is closing or opening
+                if (!_parentWindow)
+                    return;
+
+                [recordingEvent setView:_windowView];
+
+                [_windowView mouseDown:anEvent];
+
+                // -dw- if the window is clicked, the sheet should come to front, and become key,
+                // and the window should be immediately behind
+                [sheet makeKeyAndOrderFront:self];
+
+                return;
+
+            case CPMouseMoved:
+                // Allow these through to the parent
+                break;
+
+            default:
+                // Everything else is filtered
+                return;
+        }
+    }
+
+    var point = [anEvent locationInWindow];
+
+    switch (type)
+    {
+        case CPFlagsChanged:
+            return [[self firstResponder] flagsChanged:anEvent];
+
+        case CPKeyUp:
+            return [[self firstResponder] keyUp:anEvent];
+
+        case CPKeyDown:
+            if ([anEvent charactersIgnoringModifiers] === CPTabCharacter)
+            {
+                if ([anEvent modifierFlags] & CPShiftKeyMask)
+                    [self selectPreviousKeyView:self];
+                else
+                    [self selectNextKeyView:self];
+
+                // Make sure the browser doesn't try to do its own tab handling.
+                // This is important or the browser might blur the shared text field or token field input field,
+                // even that we just moved it to a new first responder.
+                [[[anEvent window] platformWindow] _propagateCurrentDOMEvent:NO]
+                return;
+            }
+            else if ([anEvent charactersIgnoringModifiers] === CPBackTabCharacter)
+            {
+                var didTabBack = [self selectPreviousKeyView:self];
+
+                if (didTabBack)
+                {
+                    // Make sure the browser doesn't try to do its own tab handling.
+                    // This is important or the browser might blur the shared text field or token field input field,
+                    // even that we just moved it to a new first responder.
+                    [[[anEvent window] platformWindow] _propagateCurrentDOMEvent:NO]
+                }
+                return didTabBack;
+            }
+            else if ([anEvent charactersIgnoringModifiers] == CPEscapeFunctionKey && [self _processKeyboardUIKey:anEvent])
+            {
+                return;
+            }
+
+            [[self firstResponder] keyDown:anEvent];
+
+            // Trigger the default button if needed
+            // FIXME: Is this only applicable in a sheet? See isse: #722.
+            if (![self disableKeyEquivalentForDefaultButton])
+            {
+                var defaultButton = [self defaultButton],
+                    keyEquivalent = [defaultButton keyEquivalent],
+                    modifierMask = [defaultButton keyEquivalentModifierMask];
+
+                if ([anEvent _triggersKeyEquivalent:keyEquivalent withModifierMask:modifierMask])
+                    [[self defaultButton] performClick:self];
+            }
+
+            return;
+
+        case CPScrollWheel:
+            [recordingEvent setView:[_windowView hitTest:point]];
+
+            return [[_windowView hitTest:point] scrollWheel:anEvent];
+
+        case CPLeftMouseUp:
+        case CPRightMouseUp:
+            var hitTestedView = _leftMouseDownView,
+                selector = type == CPRightMouseUp ? @selector(rightMouseUp:) : @selector(mouseUp:);
+
+            if (!hitTestedView)
+                hitTestedView = [_windowView hitTest:point];
+
+            [recordingEvent setView:hitTestedView];
+
+            [hitTestedView performSelector:selector withObject:anEvent];
+
+            _leftMouseDownView = nil;
+
+            return;
+
+        case CPLeftMouseDown:
+        case CPRightMouseDown:
+            // This will return _windowView if it is within a resize region
+            _leftMouseDownView = [_windowView hitTest:point];
+
+            [recordingEvent setView:_leftMouseDownView];
+
+            if (_leftMouseDownView !== _firstResponder && [_leftMouseDownView acceptsFirstResponder])
+                [self makeFirstResponder:_leftMouseDownView];
+
+            [CPApp activateIgnoringOtherApps:YES];
+
+            var theWindow = [anEvent window],
+                selector = type == CPRightMouseDown ? @selector(rightMouseDown:) : @selector(mouseDown:);
+
+            if ([theWindow isKeyWindow] || ([theWindow becomesKeyOnlyIfNeeded] && ![_leftMouseDownView needsPanelToBecomeKey]))
+                return [_leftMouseDownView performSelector:selector withObject:anEvent];
+            else
+            {
+                // FIXME: delayed ordering?
+                [self makeKeyAndOrderFront:self];
+
+                if ([_leftMouseDownView acceptsFirstMouse:anEvent])
+                    return [_leftMouseDownView performSelector:selector withObject:anEvent];
+            }
+            break;
+
+        case CPLeftMouseDragged:
+        case CPRightMouseDragged:
+            if (!_leftMouseDownView)
+            {
+                [recordingEvent setView:[_windowView hitTest:point]];
+                return [[_windowView hitTest:point] mouseDragged:anEvent];
+            }
+
+            [recordingEvent setView:_leftMouseDownView];
+
+            var selector;
+
+            if (type == CPRightMouseDragged)
+            {
+                selector = @selector(rightMouseDragged:)
+                if (![_leftMouseDownView respondsToSelector:selector])
+                    selector = nil;
+            }
+
+            if (!selector)
+                selector = @selector(mouseDragged:)
+
+            return [_leftMouseDownView performSelector:selector withObject:anEvent];
+
+        case CPMouseMoved:
+            [_windowView setCursorForLocation:point resizing:NO];
+
+            // Ignore mouse moves for parents of sheets
+            if (!_acceptsMouseMovedEvents || sheet)
+                return;
+
+            if (!_mouseEnteredStack)
+                _mouseEnteredStack = [];
+
+            var hitTestView = [_windowView hitTest:point];
+
+            if ([_mouseEnteredStack count] && [_mouseEnteredStack lastObject] === hitTestView)
+                return [hitTestView mouseMoved:anEvent];
+
+            var view = hitTestView,
+                mouseEnteredStack = [];
+
+            while (view)
+            {
+                mouseEnteredStack.unshift(view);
+
+                view = [view superview];
+            }
+
+            var deviation = MIN(_mouseEnteredStack.length, mouseEnteredStack.length);
+
+            while (deviation--)
+                if (_mouseEnteredStack[deviation] === mouseEnteredStack[deviation])
+                    break;
+
+            var index = deviation + 1,
+                count = _mouseEnteredStack.length;
+
+            if (index < count)
+            {
+                var event = [CPEvent mouseEventWithType:CPMouseExited location:point modifierFlags:[anEvent modifierFlags] timestamp:[anEvent timestamp] windowNumber:_windowNumber context:nil eventNumber:-1 clickCount:1 pressure:0];
+
+                for (; index < count; ++index)
+                    [_mouseEnteredStack[index] mouseExited:event];
+            }
+
+            index = deviation + 1;
+            count = mouseEnteredStack.length;
+
+            if (index < count)
+            {
+                var event = [CPEvent mouseEventWithType:CPMouseEntered location:point modifierFlags:[anEvent modifierFlags] timestamp:[anEvent timestamp] windowNumber:_windowNumber context:nil eventNumber:-1 clickCount:1 pressure:0];
+
+                for (; index < count; ++index)
+                    [mouseEnteredStack[index] mouseEntered:event];
+            }
+
+            _mouseEnteredStack = mouseEnteredStack;
+
+            [hitTestView mouseMoved:anEvent];
+    }
+}
+
+@end
+
+
+@implementation RecordingEvent : CPObject
+{
+    CPEvent     _event                  @accessors(property=event);
+    CPString    _keyView                @accessors(property=keyView);
+    CPString    _valueView              @accessors(property=valueView);
+    CGPoint     _offsetView             @accessors(property=offsetView);
+    int         _offsetXPercentage      @accessors(property=offsetXPercentage);
+    int         _offsetYPercentage      @accessors(property=offsetYPercentage);
+}
+
+- (id)initWithEvent:(CPEvent)anEvent
+{
+    if (self = [super init])
+    {
+        _event = anEvent;
+        _offsetView = CGPointMakeZero();
+        _keyView = @"";
+        _valueView = @"";
+    }
+
+    return self;
+}
+
+- (void)setView:(CPView)aView
+{
+    if ([aView respondsToSelector:@selector(cucappIdentifier)])
+    {
+        _keyView = @"cucappIdentifier";
+        _valueView = [aView cucappIdentifier];
+    }
+    else if ([aView respondsToSelector:@selector(identifier)])
+    {
+        _keyView = @"identifier";
+        _valueView = [aView identifier];
+    }
+    else if ([aView respondsToSelector:@selector(title)])
+    {
+        _keyView = @"title";
+        _valueView = [aView title];
+    }
+    else if ([aView respondsToSelector:@selector(placeholderString)])
+    {
+        _keyView = @"placeholderString";
+        _valueView = [aView placeholderString];
+    }
+    else if ([aView respondsToSelector:@selector(text)])
+    {
+        _keyView = @"text";
+        _valueView = [aView text];
+    }
+    else if ([aView respondsToSelector:@selector(tag)])
+    {
+        _keyView = @"tag";
+        _valueView = [aView tag];
+    }
+    else if ([aView respondsToSelector:@selector(label)])
+    {
+        _keyView = @"label";
+        _valueView = [aView label];
+    }
+    else if ([aView respondsToSelector:@selector(objectValue)])
+    {
+        _keyView = @"objectValue";
+        _valueView = [aView objectValue];
+    }
+
+    var globalPoint = [[aView superview] convertPointToBase:[aView frameOrigin]],
+        globalEventPoint = [_event locationInWindow];
+
+    _offsetView = CGPointMake(globalEventPoint.x - globalPoint.x, globalEventPoint.y - globalPoint.y);
+
+    _offsetXPercentage = _offsetView.x * 100 / [aView frameSize].width;
+    _offsetYPercentage = _offsetView.y * 100 / [aView frameSize].height;
+}
+
+- (CPString)objectToJSON
+{
+    var json = {};
+
+    json["keyView"] = _keyView;
+    json["valueView"] = _valueView;
+    json["offsetXPercentage"] = _offsetXPercentage;
+    json["offsetYPercentage"] = _offsetYPercentage;
+    json["offsetView"] = {"x" : _offsetView.x, "y" : _offsetView.y};
+
+    var event = {};
+    event["type"] = [_event type];
+    event["deltaX"] = [_event deltaX];
+    event["deltaY"] = [_event deltaY];
+    event["deltaZ"] = [_event deltaZ];
+    event["characters"] = [_event characters];
+    event["charactersIgnoringModifiers"] = [_event charactersIgnoringModifiers];
+    event["clickCount"] = [_event clickCount];
+    event["modifierFlags"] = [_event modifierFlags];
+    event["locationInWindow"] = {"x" : [_event locationInWindow].x, "y" : [_event locationInWindow].y};
+    event["keyCode"] = [_event keyCode];
+    event["timestamp"] = [_event timestamp];
+
+    json["event"] = event;
+
+    return JSON.stringify(json, null, 4);
+}
+
+@end
+
+
+@implementation CPApplication (cucappRecord)
+
+/*!
+    Dispatches events to other objects.
+    @param anEvent the event to dispatch
+*/
+- (void)sendEvent:(CPEvent)anEvent
+{
+    _currentEvent = anEvent;
+    CPEventModifierFlags = [anEvent modifierFlags];
+
+    var theWindow = [anEvent window];
+
+    // Check if this is a candidate for key equivalent...
+    if ([anEvent _couldBeKeyEquivalent] && [self _handleKeyEquivalent:anEvent])
+        // The key equivalent was handled.
+        return;
+
+    if ([anEvent type] == CPMouseMoved)
+    {
+        if (theWindow !== _lastMouseMoveWindow)
+            [_lastMouseMoveWindow _mouseExitedResizeRect];
+
+        _lastMouseMoveWindow = theWindow;
+    }
+
+    /*
+        Event listeners are processed from back to front so that newer event listeners normally take
+        precedence. If during the execution of a callback a new event listener is added, it should
+        be inserted after the current callback but before any higher priority callbacks. This makes
+        repeating event listeners (those that reinsert themselves) stable relative to each other.
+    */
+    for (var i = _eventListeners.length - 1; i >= 0; i--)
+    {
+        var listener = _eventListeners[i];
+
+        if (listener._mask & (1 << [anEvent type]))
+        {
+            _eventListeners.splice(i, 1);
+            // In case the callback wants to add more listeners.
+            _eventListenerInsertionIndex = i;
+            listener._callback(anEvent);
+
+            var type = [anEvent type],
+                recordingEvent = [[RecordingEvent alloc] initWithEvent:anEvent];
+
+            if (recordingEvent && type != CPFlagsChanged && type != CPMouseMoved)
+                [eventRecords addObject:recordingEvent];
+
+            if (theWindow)
+                [recordingEvent setView:[theWindow._windowView hitTest:[anEvent locationInWindow]]];
+
+            if (listener._dequeue)
+            {
+                // Don't process the event normally and don't send it to any other listener.
+                _eventListenerInsertionIndex = _eventListeners.length;
+                return;
+            }
+        }
+    }
+
+    _eventListenerInsertionIndex = _eventListeners.length;
+
+    if (theWindow)
+        [theWindow sendEvent:anEvent];
+}
+
+@end

Tests/CucumberTests/CPAnimationContextTest/Info.plist

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Main cib file base name</key>
+	<string>MainMenu.cib</string>
+	<key>CPBundleName</key>
+	<string>CPAnimationContextTest</string>
+    <key>CPBundleVersion</key>
+    <string>1.0</string>
+    <key>CPHumanReadableCopyright</key>
+    <string>Copyright © 2016, Your Company All rights reserved.</string>
+</dict>
+</plist>

Tests/CucumberTests/CPAnimationContextTest/Jakefile

@@ -0,0 +1,194 @@
+/*
+ * Jakefile
+ * CPAnimationContextTest
+ *
+ * Created by You on May 6, 2016.
+ * Copyright 2016, Your Company All rights reserved.
+ */
+
+var ENV = require("system").env,
+    FILE = require("file"),
+    JAKE = require("jake"),
+    task = JAKE.task,
+    FileList = JAKE.FileList,
+    app = require("cappuccino/jake").app,
+    configuration = ENV["CONFIG"] || ENV["CONFIGURATION"] || ENV["c"] || "Debug",
+    OS = require("os"),
+    projectName = "CPAnimationContextTest";
+
+app (projectName, function(task)
+{
+    ENV["OBJJ_INCLUDE_PATHS"] = "Frameworks";
+
+    if (configuration === "Debug")
+        ENV["OBJJ_INCLUDE_PATHS"] = FILE.join(ENV["OBJJ_INCLUDE_PATHS"], configuration);
+
+    task.setBuildIntermediatesPath(FILE.join("Build", "CPAnimationContextTest.build", configuration));
+    task.setBuildPath(FILE.join("Build", configuration));
+
+    task.setProductName("CPAnimationContextTest");
+    task.setIdentifier("com.yourcompany.CPAnimationContextTest");
+    task.setVersion("1.0");
+    task.setAuthor("Your Company");
+    task.setEmail("feedback @nospam@ yourcompany.com");
+    task.setSummary("CPAnimationContextTest");
+    task.setSources(new FileList("**/*.j").exclude(FILE.join("Build", "**")).exclude(FILE.join("Frameworks", "Source", "**")));
+    task.setResources(new FileList("Resources/**"));
+    task.setIndexFilePath("index.html");
+    task.setInfoPlistPath("Info.plist");
+
+    if (configuration === "Debug")
+        task.setCompilerFlags("-DDEBUG -g");
+    else
+        task.setCompilerFlags("-O2");
+});
+
+task ("default", [projectName], function()
+{
+    printResults(configuration);
+});
+
+task ("build", ["default"], function()
+{
+    updateApplicationSize();
+});
+
+task ("debug", function()
+{
+    configuration = ENV["CONFIGURATION"] = "Debug";
+    JAKE.subjake(["."], "build", ENV);
+});
+
+task ("release", function()
+{
+    configuration = ENV["CONFIGURATION"] = "Release";
+    JAKE.subjake(["."], "build", ENV);
+});
+
+task ("run", ["debug"], function()
+{
+    OS.system(["open", FILE.join("Build", "Debug", projectName, "index.html")]);
+});
+
+task ("run-release", ["release"], function()
+{
+    OS.system(["open", FILE.join("Build", "Release", projectName, "index.html")]);
+});
+
+task ("deploy", ["release"], function()
+{
+    FILE.mkdirs(FILE.join("Build", "Deployment", projectName));
+    OS.system(["press", "-f", FILE.join("Build", "Release", projectName), FILE.join("Build", "Deployment", projectName)]);
+    printResults("Deployment")
+});
+
+task ("desktop", ["release"], function()
+{
+    FILE.mkdirs(FILE.join("Build", "Desktop", projectName));
+    require("cappuccino/nativehost").buildNativeHost(FILE.join("Build", "Release", projectName), FILE.join("Build", "Desktop", projectName, "CPAnimationContextTest.app"));
+    printResults("Desktop")
+});
+
+task ("run-desktop", ["desktop"], function()
+{
+    OS.system([FILE.join("Build", "Desktop", projectName, "CPAnimationContextTest.app", "Contents", "MacOS", "NativeHost"), "-i"]);
+});
+
+function printResults(configuration)
+{
+    print("----------------------------");
+    print(configuration+" app built at path: "+FILE.join("Build", configuration, projectName));
+    print("----------------------------");
+}
+
+function updateApplicationSize()
+{
+    print("Calculating application file sizes...");
+
+    var contents = FILE.read(FILE.join("Build", configuration, projectName, "Info.plist"), { charset:"UTF-8" }),
+        format = CFPropertyList.sniffedFormatOfString(contents),
+        plist = CFPropertyList.propertyListFromString(contents),
+        totalBytes = {executable:0, data:0, mhtml:0};
+
+    // Get the size of all framework executables and sprite data
+    var frameworksDir = "Frameworks";
+
+    if (configuration === "Debug")
+        frameworksDir = FILE.join(frameworksDir, "Debug");
+
+    var frameworks = FILE.list(frameworksDir);
+
+    frameworks.forEach(function(framework)
+    {
+        if (framework !== "Source")
+            addBundleFileSizes(FILE.join(frameworksDir, framework), totalBytes);
+    });
+
+    // Read in the default theme name, and attempt to get its size
+    var themeName = plist.valueForKey("CPDefaultTheme") || "Aristo2",
+        themePath = nil;
+
+    if (themeName === "Aristo" || themeName === "Aristo2")
+        themePath = FILE.join(frameworksDir, "AppKit", "Resources", themeName + ".blend");
+    else
+        themePath = FILE.join("Frameworks", "Resources", themeName + ".blend");
+
+    if (FILE.isDirectory(themePath))
+        addBundleFileSizes(themePath, totalBytes);
+
+    // Add sizes for the app
+    addBundleFileSizes(FILE.join("Build", configuration, projectName), totalBytes);
+
+    print("Executables: " + totalBytes.executable + ", sprite data: " + totalBytes.data + ", total: " + (totalBytes.executable + totalBytes.data));
+
+    var dict = new CFMutableDictionary();
+
+    dict.setValueForKey("executable", totalBytes.executable);
+    dict.setValueForKey("data", totalBytes.data);
+    dict.setValueForKey("mhtml", totalBytes.mhtml);
+
+    plist.setValueForKey("CPApplicationSize", dict);
+
+    FILE.write(FILE.join("Build", configuration, projectName, "Info.plist"), CFPropertyList.stringFromPropertyList(plist, format), { charset:"UTF-8" });
+}
+
+function addBundleFileSizes(bundlePath, totalBytes)
+{
+    var bundleName = FILE.basename(bundlePath),
+        environment = bundleName === "Foundation" ? "Objj" : "Browser",
+        bundlePath = FILE.join(bundlePath, environment + ".environment");
+
+    if (FILE.isDirectory(bundlePath))
+    {
+        var filename = bundleName + ".sj",
+            filePath = new FILE.Path(FILE.join(bundlePath, filename));
+
+        if (filePath.exists())
+            totalBytes.executable += filePath.size();
+
+        filePath = new FILE.Path(FILE.join(bundlePath, "dataURLs.txt"));
+
+        if (filePath.exists())
+            totalBytes.data += filePath.size();
+
+        filePath = new FILE.Path(FILE.join(bundlePath, "MHTMLData.txt"));
+
+        if (filePath.exists())
+            totalBytes.mhtml += filePath.size();
+
+        filePath = new FILE.Path(FILE.join(bundlePath, "MHTMLPaths.txt"));
+
+        if (filePath.exists())
+            totalBytes.mhtml += filePath.size();
+    }
+}
+
+task ("cucumber-test", function()
+{
+    var SYSTEM = require("system");
+
+    OS.system("ln -s " + SYSTEM.prefix + "/packages/cucapp/Cucapp Cucapp")
+    var code = OS.system("cucumber");
+    OS.system("rm -f Cucapp; rm -f cucumber.html")
+    OS.exit(code);
+});

Tests/CucumberTests/CPAnimationContextTest/Resources/MainMenu.xib

@@ -0,0 +1,577 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15E65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+    <dependencies>
+        <deployment version="1050" identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
+            <connections>
+                <outlet property="delegate" destination="450" id="451"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <menu title="AMainMenu" systemMenu="main" id="29" userLabel="MainMenu">
+            <items>
+                <menuItem title="NewApplication" id="56">
+                    <menu key="submenu" title="NewApplication" systemMenu="apple" id="57">
+                        <items>
+                            <menuItem title="About NewApplication" id="58">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="orderFrontStandardAboutPanel:" target="-2" id="142"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="236">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Preferences…" keyEquivalent="," id="129" userLabel="121"/>
+                            <menuItem isSeparatorItem="YES" id="143">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Services" id="131">
+                                <menu key="submenu" title="Services" systemMenu="services" id="130"/>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="144">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Hide NewApplication" keyEquivalent="h" id="134">
+                                <connections>
+                                    <action selector="hide:" target="-1" id="367"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Hide Others" keyEquivalent="h" id="145">
+                                <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                <connections>
+                                    <action selector="hideOtherApplications:" target="-1" id="368"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Show All" id="150">
+                                <connections>
+                                    <action selector="unhideAllApplications:" target="-1" id="370"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="149">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Quit NewApplication" keyEquivalent="q" id="136" userLabel="1111">
+                                <connections>
+                                    <action selector="terminate:" target="-3" id="449"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="File" id="83">
+                    <menu key="submenu" title="File" id="81">
+                        <items>
+                            <menuItem title="New" keyEquivalent="n" id="82" userLabel="9">
+                                <connections>
+                                    <action selector="newDocument:" target="-1" id="373"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Open…" keyEquivalent="o" id="72">
+                                <connections>
+                                    <action selector="openDocument:" target="-1" id="374"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Open Recent" id="124">
+                                <menu key="submenu" title="Open Recent" systemMenu="recentDocuments" id="125">
+                                    <items>
+                                        <menuItem title="Clear Menu" id="126">
+                                            <connections>
+                                                <action selector="clearRecentDocuments:" target="-1" id="127"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="79" userLabel="7">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Close" keyEquivalent="w" id="73" userLabel="1">
+                                <connections>
+                                    <action selector="performClose:" target="-1" id="193"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Save" keyEquivalent="s" id="75" userLabel="3">
+                                <connections>
+                                    <action selector="saveDocument:" target="-1" id="362"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Save As…" keyEquivalent="S" id="80" userLabel="8">
+                                <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
+                                <connections>
+                                    <action selector="saveDocumentAs:" target="-1" id="363"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Revert to Saved" id="112" userLabel="10">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <connections>
+                                    <action selector="revertDocumentToSaved:" target="-1" id="364"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="74" userLabel="2">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Page Setup..." keyEquivalent="P" id="77" userLabel="5">
+                                <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
+                                <connections>
+                                    <action selector="runPageLayout:" target="-1" id="87"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Print…" keyEquivalent="p" id="78" userLabel="6">
+                                <connections>
+                                    <action selector="print:" target="-1" id="86"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="Edit" id="217">
+                    <menu key="submenu" title="Edit" id="205">
+                        <items>
+                            <menuItem title="Undo" keyEquivalent="z" id="207">
+                                <connections>
+                                    <action selector="undo:" target="-1" id="223"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Redo" keyEquivalent="Z" id="215">
+                                <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
+                                <connections>
+                                    <action selector="redo:" target="-1" id="231"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="206">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Cut" keyEquivalent="x" id="199">
+                                <connections>
+                                    <action selector="cut:" target="-1" id="228"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Copy" keyEquivalent="c" id="197">
+                                <connections>
+                                    <action selector="copy:" target="-1" id="224"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Paste" keyEquivalent="v" id="203">
+                                <connections>
+                                    <action selector="paste:" target="-1" id="226"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Delete" id="202">
+                                <connections>
+                                    <action selector="delete:" target="-1" id="235"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Select All" keyEquivalent="a" id="198">
+                                <connections>
+                                    <action selector="selectAll:" target="-1" id="232"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="214">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Find" id="218">
+                                <menu key="submenu" title="Find" id="220">
+                                    <items>
+                                        <menuItem title="Find…" tag="1" keyEquivalent="f" id="209">
+                                            <connections>
+                                                <action selector="performFindPanelAction:" target="-1" id="241"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Find Next" tag="2" keyEquivalent="g" id="208"/>
+                                        <menuItem title="Find Previous" tag="3" keyEquivalent="G" id="213">
+                                            <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
+                                        </menuItem>
+                                        <menuItem title="Use Selection for Find" tag="7" keyEquivalent="e" id="221"/>
+                                        <menuItem title="Jump to Selection" keyEquivalent="j" id="210">
+                                            <connections>
+                                                <action selector="centerSelectionInVisibleArea:" target="-1" id="245"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="Spelling and Grammar" id="216">
+                                <menu key="submenu" title="Spelling and Grammar" id="200">
+                                    <items>
+                                        <menuItem title="Show Spelling…" keyEquivalent=":" id="204">
+                                            <connections>
+                                                <action selector="showGuessPanel:" target="-1" id="230"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Check Spelling" keyEquivalent=";" id="201">
+                                            <connections>
+                                                <action selector="checkSpelling:" target="-1" id="225"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Check Spelling While Typing" id="219">
+                                            <connections>
+                                                <action selector="toggleContinuousSpellChecking:" target="-1" id="222"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Check Grammar With Spelling" id="346">
+                                            <connections>
+                                                <action selector="toggleGrammarChecking:" target="-1" id="347"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="Substitutions" id="348">
+                                <menu key="submenu" title="Substitutions" id="349">
+                                    <items>
+                                        <menuItem title="Smart Copy/Paste" tag="1" keyEquivalent="f" id="350">
+                                            <connections>
+                                                <action selector="toggleSmartInsertDelete:" target="-1" id="355"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Smart Quotes" tag="2" keyEquivalent="g" id="351">
+                                            <connections>
+                                                <action selector="toggleAutomaticQuoteSubstitution:" target="-1" id="356"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Smart Links" tag="3" keyEquivalent="G" id="354">
+                                            <modifierMask key="keyEquivalentModifierMask" shift="YES" command="YES"/>
+                                            <connections>
+                                                <action selector="toggleAutomaticLinkDetection:" target="-1" id="357"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="Speech" id="211">
+                                <menu key="submenu" title="Speech" id="212">
+                                    <items>
+                                        <menuItem title="Start Speaking" id="196">
+                                            <connections>
+                                                <action selector="startSpeaking:" target="-1" id="233"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Stop Speaking" id="195">
+                                            <connections>
+                                                <action selector="stopSpeaking:" target="-1" id="227"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="Format" id="375">
+                    <modifierMask key="keyEquivalentModifierMask"/>
+                    <menu key="submenu" title="Format" id="376">
+                        <items>
+                            <menuItem title="Font" id="377">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <menu key="submenu" title="Font" systemMenu="font" id="388">
+                                    <items>
+                                        <menuItem title="Show Fonts" keyEquivalent="t" id="389"/>
+                                        <menuItem title="Bold" tag="2" keyEquivalent="b" id="390"/>
+                                        <menuItem title="Italic" tag="1" keyEquivalent="i" id="391"/>
+                                        <menuItem title="Underline" keyEquivalent="u" id="392">
+                                            <connections>
+                                                <action selector="underline:" target="-1" id="432"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="393"/>
+                                        <menuItem title="Bigger" tag="3" keyEquivalent="+" id="394"/>
+                                        <menuItem title="Smaller" tag="4" keyEquivalent="-" id="395"/>
+                                        <menuItem isSeparatorItem="YES" id="396"/>
+                                        <menuItem title="Kern" id="397">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <menu key="submenu" title="Kern" id="415">
+                                                <items>
+                                                    <menuItem title="Use Default" id="416">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="useStandardKerning:" target="-1" id="438"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Use None" id="417">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="turnOffKerning:" target="-1" id="441"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Tighten" id="418">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="tightenKerning:" target="-1" id="431"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Loosen" id="419">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="loosenKerning:" target="-1" id="435"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                </items>
+                                            </menu>
+                                        </menuItem>
+                                        <menuItem title="Ligature" id="398">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <menu key="submenu" title="Ligature" id="411">
+                                                <items>
+                                                    <menuItem title="Use Default" id="412">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="useStandardLigatures:" target="-1" id="439"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Use None" id="413">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="turnOffLigatures:" target="-1" id="440"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Use All" id="414">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="useAllLigatures:" target="-1" id="434"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                </items>
+                                            </menu>
+                                        </menuItem>
+                                        <menuItem title="Baseline" id="399">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <menu key="submenu" title="Baseline" id="405">
+                                                <items>
+                                                    <menuItem title="Use Default" id="406">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="unscript:" target="-1" id="437"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Superscript" id="407">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="superscript:" target="-1" id="430"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Subscript" id="408">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="subscript:" target="-1" id="429"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Raise" id="409">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="raiseBaseline:" target="-1" id="426"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                    <menuItem title="Lower" id="410">
+                                                        <modifierMask key="keyEquivalentModifierMask"/>
+                                                        <connections>
+                                                            <action selector="lowerBaseline:" target="-1" id="427"/>
+                                                        </connections>
+                                                    </menuItem>
+                                                </items>
+                                            </menu>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="400"/>
+                                        <menuItem title="Show Colors" keyEquivalent="C" id="401">
+                                            <connections>
+                                                <action selector="orderFrontColorPanel:" target="-1" id="433"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="402"/>
+                                        <menuItem title="Copy Style" keyEquivalent="c" id="403">
+                                            <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                            <connections>
+                                                <action selector="copyFont:" target="-1" id="428"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Paste Style" keyEquivalent="v" id="404">
+                                            <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                            <connections>
+                                                <action selector="pasteFont:" target="-1" id="436"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                            <menuItem title="Text" id="378">
+                                <modifierMask key="keyEquivalentModifierMask"/>
+                                <menu key="submenu" title="Text" id="379">
+                                    <items>
+                                        <menuItem title="Align Left" keyEquivalent="{" id="380">
+                                            <connections>
+                                                <action selector="alignLeft:" target="-1" id="442"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Center" keyEquivalent="|" id="381">
+                                            <connections>
+                                                <action selector="alignCenter:" target="-1" id="445"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Justify" id="382">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="alignJustified:" target="-1" id="443"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Align Right" keyEquivalent="}" id="383">
+                                            <connections>
+                                                <action selector="alignRight:" target="-1" id="447"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem isSeparatorItem="YES" id="384"/>
+                                        <menuItem title="Show Ruler" id="385">
+                                            <modifierMask key="keyEquivalentModifierMask"/>
+                                            <connections>
+                                                <action selector="toggleRuler:" target="-1" id="446"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Copy Ruler" keyEquivalent="c" id="386">
+                                            <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
+                                            <connections>
+                                                <action selector="copyRuler:" target="-1" id="444"/>
+                                            </connections>
+                                        </menuItem>
+                                        <menuItem title="Paste Ruler" keyEquivalent="v" id="387">
+                                            <modifierMask key="keyEquivalentModifierMask" control="YES" command="YES"/>
+                                            <connections>
+                                                <action selector="pasteRuler:" target="-1" id="448"/>
+                                            </connections>
+                                        </menuItem>
+                                    </items>
+                                </menu>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="View" id="295">
+                    <menu key="submenu" title="View" id="296">
+                        <items>
+                            <menuItem title="Show Toolbar" keyEquivalent="t" id="297">
+                                <modifierMask key="keyEquivalentModifierMask" option="YES" command="YES"/>
+                                <connections>
+                                    <action selector="toggleToolbarShown:" target="-1" id="366"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Customize Toolbar…" id="298">
+                                <connections>
+                                    <action selector="runToolbarCustomizationPalette:" target="-1" id="365"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="Window" id="19">
+                    <menu key="submenu" title="Window" systemMenu="window" id="24">
+                        <items>
+                            <menuItem title="Minimize" keyEquivalent="m" id="23">
+                                <connections>
+                                    <action selector="performMiniaturize:" target="-1" id="37"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem title="Zoom" id="239">
+                                <connections>
+                                    <action selector="performZoom:" target="-1" id="240"/>
+                                </connections>
+                            </menuItem>
+                            <menuItem isSeparatorItem="YES" id="92">
+                                <modifierMask key="keyEquivalentModifierMask" command="YES"/>
+                            </menuItem>
+                            <menuItem title="Bring All to Front" id="5">
+                                <connections>
+                                    <action selector="arrangeInFront:" target="-1" id="39"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+                <menuItem title="Help" id="103" userLabel="1">
+                    <menu key="submenu" title="Help" id="106" userLabel="2">
+                        <items>
+                            <menuItem title="NewApplication Help" keyEquivalent="?" id="111">
+                                <connections>
+                                    <action selector="showHelp:" target="-1" id="360"/>
+                                </connections>
+                            </menuItem>
+                        </items>
+                    </menu>
+                </menuItem>
+            </items>
+        </menu>
+        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="371">
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
+            <windowPositionMask key="initialPositionMask" leftStrut="YES" bottomStrut="YES"/>
+            <rect key="contentRect" x="335" y="390" width="940" height="1040"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1680" height="1028"/>
+            <view key="contentView" id="372">
+                <rect key="frame" x="0.0" y="0.0" width="940" height="1040"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <button identifier="run" verticalHuggingPriority="750" id="462">
+                        <rect key="frame" x="332" y="999" width="134" height="32"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <buttonCell key="cell" type="push" title="Start Animation" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="463">
+                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES" changeBackground="YES" changeGray="YES"/>
+                            <font key="font" metaFont="system"/>
+                        </buttonCell>
+                        <connections>
+                            <action selector="test:" target="450" id="0vd-DD-jrm"/>
+                        </connections>
+                    </button>
+                    <customView identifier="draw" id="FJv-ci-zoT" customClass="DrawView">
+                        <rect key="frame" x="29" y="769" width="148" height="115"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                    </customView>
+                    <customView identifier="layout" id="Ff1-j8-ljn" customClass="CustomLayoutView">
+                        <rect key="frame" x="29" y="637" width="148" height="115"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <subviews>
+                            <customView identifier="vanilla" id="obD-Te-e4b" customClass="ColorView">
+                                <rect key="frame" x="20" y="52" width="53" height="43"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                            </customView>
+                            <customView identifier="vanilla" id="kng-GZ-UzT" customClass="ColorView">
+                                <rect key="frame" x="86" y="52" width="53" height="43"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                            </customView>
+                            <customView identifier="vanilla" id="Ofx-KZ-FgQ" customClass="ColorView">
+                                <rect key="frame" x="48" y="6" width="53" height="43"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                            </customView>
+                        </subviews>
+                    </customView>
+                    <customView identifier="drawLayout" id="dLm-xl-6jP" customClass="CustomLayoutDrawView">
+                        <rect key="frame" x="29" y="499" width="148" height="115"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <subviews>
+                            <customView identifier="vanilla" id="Zo1-nI-BE8" customClass="ColorView">
+                                <rect key="frame" x="12" y="61" width="53" height="43"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                            </customView>
+                            <customView identifier="vanilla" id="Ohs-DN-x4k" customClass="ColorView">
+                                <rect key="frame" x="84" y="61" width="53" height="43"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                            </customView>
+                            <customView identifier="vanilla" id="OGq-ro-Klu" customClass="ColorView">
+                                <rect key="frame" x="48" y="10" width="53" height="43"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                            </customView>
+                        </subviews>
+                    </customView>
+                </subviews>
+            </view>
+            <point key="canvasLocation" x="643" y="761"/>
+        </window>
+        <customObject id="450" customClass="AppController">
+            <connections>
+                <outlet property="drawView" destination="FJv-ci-zoT" id="HzW-FO-0Sa"/>
+                <outlet property="layoutDrawView" destination="dLm-xl-6jP" id="6fs-7K-Eeq"/>
+                <outlet property="layoutView" destination="Ff1-j8-ljn" id="ryQ-pg-Xmz"/>
+                <outlet property="theWindow" destination="371" id="459"/>
+            </connections>
+        </customObject>
+    </objects>
+</document>

Tests/CucumberTests/CPAnimationContextTest/features/step_definitions/steps.rb

@@ -0,0 +1,177 @@
+# Given the application is lauched
+Given /^the application is launched$/ do
+  launched = app.gui.command "launched"
+
+  if !launched
+    raise "The application was not launched"
+  end
+end
+
+# Given I wait for n seconds
+Given /^I wait for (\d+) seconds?$/ do |n|
+  sleep(eval("#{n.to_i}"))
+end
+
+# When I close the popover
+When /^I close the popover$/ do
+  step "I hit the key escape"
+end
+
+
+# When I hit the key c
+When /^I hit the key (.*)$/ do |key|
+  step "I hit the mask none and the key #{key}"
+end
+
+
+# When I hit the mask shif and the key c
+When /^I hit the mask (.*) and the key (.*)$/ do |mask, key|
+  simulate_keyboard_event(key, mask)
+end
+
+
+# When the keys cucapp
+When /^I hit the keys (.*)$/ do |keys|
+  step "I hit the mask none and keys #{keys}"
+end
+
+
+# When I hit the mask shif and the keys cucapp
+When /^I hit the mask (.*) and keys (.*)$/ do |mask, keys|
+  simulate_keyboard_event(keys, mask)
+end
+
+
+# When I select all
+When /^I select all$/ do
+  app.gui.simulate_keyboard_event    "a", [$CPCommandKeyMask]
+end
+
+
+# When I save the document
+When /^I save the document$/ do
+  app.gui.simulate_keyboard_event    "s", [$CPCommandKeyMask]
+end
+
+
+# When I (click|right click|double click) on the field with the value cucapp
+When /^I (click|right click|double click) on the (\w*\-*\w*) with the value (.*)$/ do |click_type, element, value|
+  step "I #{click_type} on the #{element} with the property object-value set to #{value}"
+end
+
+
+# When I click on the field with the property cucapp-identifier set to cucapp-identifier-button-add
+When /^I (click|right click|double click) on the (\w*\-*\w*) with the property (\w*\-*\w*) set to (.*)$/ do |click_type, element, property, property_value|
+  step "I #{click_type} with the key mask none on the #{element} with the property #{property} set to #{property_value}"
+end
+
+
+# When I click with the mask shift on the field with the property cucapp-identifier set to cucapp-identifier-button-add
+When /^I (click|right click|double click) with the key mask (.*) on the (\w*\-*\w*) with the property (\w*\-*\w*) set to (.*)$/ do |click_type, mask, element,  property, property_value|
+
+  type = $mouse_left_click
+
+  if click_type == "right click"
+    type = $mouse_right_click
+  end
+
+  if click_type == "double click"
+    type = $mouse_double_click
+  end
+
+  simulate_click(type, element, property, property_value, mask)
+end
+
+
+# When I do a drag and drop from the field with the value cucapp to the field with the value cappuccino
+When /^I do a drag and drop from the (\w*\-*\w*) with the value (.*) to the (\w*\-*\w*) with the value (.*)$/ do |element, value, second_element, second_value|
+  step "I do a drag and drop from the #{element} with the property object-value set to #{value} to the #{second_element} with the property object-value set to #{second_value}"
+end
+
+
+# When I do a drag and drop from the field with the property title set to cucapp to the field with the property title set to cappuccino
+When /^I do a drag and drop from the (\w*\-*\w*) with the property (\w*\-*\w*) set to (.*) to the (\w*\-*\w*) with the property (\w*\-*\w*) set to (.*)$/ do |element, property, property_value, second_element, second_property, second_property_value|
+  step "I do a drag and drop with the key mask none from the #{element} with the property #{property} set to #{property_value} to the #{second_element} with the property #{second_property} set to #{second_property_value}"
+end
+
+
+# When I do a drag and drop with the key mask shift from the field with the property title set to cucapp to the field with the property title set to cappuccino
+When /^I do a drag and drop with the key mask (.*) from the (\w*\-*\w*) with the property (\w*\-*\w*) set to (.*) to the (\w*\-*\w*) with the property (\w*\-*\w*) set to (.*)$/ do |mask, element, property, property_value, second_element, second_property, second_property_value|
+  simulate_drag_and_drop(element, property, property_value, second_element, second_property, second_property_value, mask)
+end
+
+
+# When I vertically|horizontally scroll on the field with the value cappuccino
+When /^I (vertically|horizontally) scroll on the (\w*\-*\w*) with the value (.*)$/ do |direction, element, value|
+  step "When I #{direction} scroll 10 times on the #{element} with the value #{value}"
+end
+
+
+# When I vertically|horizontally scroll 10 times on the field with the value cappuccino
+When /^I (vertically|horizontally) scroll ([0-9]*) times on the (\w*\-*\w*) with the value (.*)$/ do |direction, times, element, value|
+  step "I #{direction} scroll #{times} times on the #{element} with the property object-value set to #{value}"
+end
+
+
+# When I vertically|horizontally scroll 10 times on the field with the property title set to cappuccino
+When /^I (vertically|horizontally) scroll ([0-9]*) times on the (\w*\-*\w*) with the property (\w*\-*\w*) set to (.*)$/ do |direction, times, element, property, property_value|
+  step "I #{direction} scroll #{times} times with the key mask none on the #{element} with the property #{property} set to #{property_value}"
+end
+
+
+# When I vertically|horizontally scroll 10 times on the field with the property title set to cappuccino
+When /^I (vertically|horizontally) scroll ([0-9]*) times with the key mask (.*) on the (\w*\-*\w*) with the property (\w*\-*\w*) set to (.*)$/ do |direction, times, mask, element, property, property_value|
+
+  vertically = false
+  horizontally = false
+
+  if direction == "vertically"
+    vertically = true
+  end
+
+  if direction == "horizontally"
+    horizontally = true
+  end
+
+  simulate_scroll(element, property, property_value, times, mask, horizontally, vertically)
+end
+
+
+# When I select the item name of the pop-up-button with the property cucapp-identifier set to cucappIdentifierPopUpButton
+When /^I select the item (.*) of the pop-up-button with the property (\w*\-*\w*) set to (.*)$/ do |item_name, property, property_value|
+  select_pop_up_button_item(item_name, property, property_value)
+end
+
+
+# Then the field with the property title set to name should be focused
+Then /^the (\w*\-*\w*) with the property (\w*\-*\w*) set to (.*) should be focused$/ do |element, property, property_value|
+  app.gui.is_control_focused(create_xpath(element, property, property_value))
+end
+
+
+# Then the field should not have a value
+Then /^the (\w*\-*\w*) should not have a value$/ do |element|
+  step "the #{element} with the property object-value set to #{value} should have the value #{value}"
+end
+
+
+# Then the field with the property cucapp-identifier set to cucapp-identifier-textfield-description should not have a value
+Then /^the (\w*\-*\w*) with the property (\w*\-*\w*) set to (.*) should not have a value$/ do |element, property, property_value|
+  check_value_control(element, property, property_value, nil)
+end
+
+
+# Then the field should have the value cucapp
+Then /^the (\w*\-*\w*) should have the value (.*)$/ do |element, value|
+  step "the #{element} with the property object-value set to #{value} should have the value #{value}"
+end
+
+
+# Then the field with the property cucapp-identifier set to cucapp-identifier-textfield-description should have the value cucapp
+Then /^the (\w*\-*\w*) with the property (\w*\-*\w*) set to (.*) should have the value (.*)$/ do |element, property, property_value, value|
+  check_value_control(element, property, property_value, value)
+end
+
+Then /^the delegate property (\w*) should have the value (.*)$/ do |property, value|
+  check_delegate_property(property, value)
+end

Tests/CucumberTests/CPAnimationContextTest/features/support/Cucumber+Extensions.j

@@ -0,0 +1,30 @@
+@import <Foundation/Foundation.j>
+
+@implementation Cucumber (CuCapp)
+
+- (CPString)valueIsEqual:(CPArray)params
+{
+    var obj = cucumber_objects[params[0]],
+        value = params[1];
+
+    if (!obj)
+        return '{"result" : "__CUKE_ERROR__"}';
+
+    if ([obj respondsToSelector:@selector(stringValue)] && value === [obj stringValue])
+        return '{"result" : "OK"}';
+
+    return '{"result" : "__CUKE_ERROR__"}';
+}
+
+- (CPString)delegatePropertyIsEqual:(CPArray)params
+{
+    var property = params[0],
+        value = params[1];
+
+    if (property == nil || value !== [[[CPApplication sharedApplication] delegate] valueForKey:property])
+        return '{"result" : "__CUKE_ERROR__"}';
+
+    return '{"result" : "OK"}';
+}
+
+@end

Tests/CucumberTests/CPAnimationContextTest/features/support/cappuccino_mappings.rb

@@ -0,0 +1,62 @@
+$cappuccino_control_mappings = {
+  "image-view-text"     => "_CPImageAndTextView",
+  "menu-item"           => "_CPMenuItemView",
+  "tool-bar-item"       => "_CPToolbarItemView",
+  "box"                 => "CPBox",
+  "button"              => "CPButton",
+  "button-bar"          => "CPButtonBar",
+  "collection-view"     => "CPCollectionView",
+  "combo-box"           => "CPComboBox",
+  "control"             => "CPControl",
+  "check-box"           => "CPCheckBox",
+  "date-picker"         => "CPDatePicker",
+  "image-view"          => "CPImageView",
+  "level-indicator"     => "CPLevelIndicator",
+  "outline-view"        => "CPOutlineView",
+  "pop-up-button"       => "CPPopUpButton",
+  "predicate-editor"    => "CPPredicateEditor",
+  "radio-button"        => "CPRadio",
+  "rule-editor"         => "CPRuleEditor",
+  "scroller"            => "CPScroller",
+  "scroll-view"         => "CPScrollView",
+  "search-field"        => "CPSearchField",
+  "secure-field"        => "CPSecureTextField",
+  "segemented-control"  => "CPSegmentedControl",
+  "slider"              => "CPSlider",
+  "stepper"             => "CPStepper",
+  "tab-view"            => "CPTabView",
+  "table"               => "CPTableView",
+  "field"               => "CPTextField",
+  "token-field"         => "CPTokenField",
+  "view"                => "CPView",
+  "none"                => nil
+}
+
+$property_mappings = {
+  "cucapp-identifier" => "cucappIdentifier",
+  "id"                => "id",
+  "identifier"        => "identifier",
+  "label"             => "label",
+  "object-value"      => "objectValue",
+  "placeholder"       => "placeholderString",
+  "tag"               => "tag",
+  "title"             => "title",
+  "text"              => "text",
+  "none"              => nil
+}
+
+$key_mappings = {
+  "command"     => $CPCommandKeyMask,
+  "shift"       => $CPShiftKeyMask,
+  "option"      => $CPAlternateKeyMask,
+  "control"     => $CPControlKeyMask,
+  "delete"      => $CPDeleteCharacter,
+  "escape"      => $CPEscapeFunctionKey,
+  "enter"       => $CPNewlineCharacter,
+  "left-arrow"  => $CPLeftArrowFunctionKey,
+  "right-arrow" => $CPRightArrowFunctionKey,
+  "top-arrow"   => $CPTopArrowFunctionKey,
+  "down-arrow"  => $CPDownArrowFunctionKey,
+  "tab"         => $CPTabCharacter,
+  "none"        => nil
+}

Tests/CucumberTests/CPAnimationContextTest/features/support/encumber_category.rb

@@ -0,0 +1,20 @@
+module Encumber
+
+  class GUI
+    def value_is_equal(xpath, value)
+
+      if !value
+        value = ""
+      end
+
+      result = command 'valueIsEqual', id_for_element(xpath), value
+      raise "Value #{value} not found" if result["result"] != "OK"
+    end
+
+    def delegate_property_is_equal(property, value)
+      result = command 'delegatePropertyIsEqual', property, value
+      raise "Value #{value} not found" if result["result"] != "OK"
+    end
+
+  end
+end

Tests/CucumberTests/CPAnimationContextTest/features/support/env.rb

@@ -0,0 +1,20 @@
+$: << File.join(File.dirname(__FILE__), '..', '..', 'Cucapp')
+
+require 'cucapp.rb'
+require 'logger'
+
+module AppHelper
+
+  def app
+    @app ||= Cucapp.new
+  end
+
+  def log
+    @log ||= ENV['log']
+  end
+
+end
+
+World(
+  AppHelper
+)

Tests/CucumberTests/CPAnimationContextTest/features/support/hooks.rb

@@ -0,0 +1,7 @@
+Before do
+  app.reset()
+end
+
+After do
+  app.quit()
+end

Tests/CucumberTests/CPAnimationContextTest/features/support/steps_helpers.rb

@@ -0,0 +1,97 @@
+
+def check_delegate_property(property, value)
+    app.gui.delegate_property_is_equal  property, value
+end
+
+def check_value_control(element, property, property_value, value)
+  xpath = create_xpath(element, property, property_value)
+
+  app.gui.wait_for        xpath
+  app.gui.value_is_equal  xpath, value
+end
+
+def simulate_keyboard_event(keys, mask)
+  app.gui.simulate_keyboard_events    cappuccino_key(keys), [cappuccino_key(mask)]
+end
+
+def simulate_click(type, element, property, property_value, mask)
+  xpath = create_xpath(element, property, property_value)
+
+  app.gui.wait_for              xpath
+
+  if type == $mouse_double_click
+    app.gui.simulate_double_click   xpath, [cappuccino_key(mask)]
+  elsif type == $mouse_right_click
+    app.gui.simulate_right_click    xpath, [cappuccino_key(mask)]
+  else
+    app.gui.simulate_left_click     xpath, [cappuccino_key(mask)]
+  end
+end
+
+def simulate_drag_and_drop(element, property, property_value, second_element, second_property, second_property_value, mask)
+
+  xpath1 = create_xpath(element, property, property_value)
+  xpath2 = create_xpath(second_element, second_property, second_property_value)
+
+  app.gui.simulate_dragged_click_view_to_view xpath1, xpath2, [cappuccino_key(mask)]
+end
+
+def simulate_scroll(element, property, property_value, times, mask, horizontal, vertical)
+  xpath = create_xpath(element, property, property_value)
+  delta_x = 0
+  delta_y = 0
+
+  if horizontal
+    delta_x = 1
+  end
+
+  if vertical
+    delta_y = 1
+  end
+
+  for i in 0..times.to_i
+    app.gui.simulate_scroll_wheel xpath, delta_x, delta_y, [cappuccino_key(mask)]
+  end
+end
+
+def select_pop_up_button_item(item_name, property, property_value)
+  simulate_click($mouse_left_click, "pop-up-button", property, property_value, [])
+
+  pop_up_button_xpath = create_xpath("pop-up-button", property, property_value)
+
+  pop_up_button_item_xpath = create_xpath("image-view-text", "text", item_name)
+
+  while !app.gui.wait_for_element(pop_up_button_item_xpath, 0.05) && app.gui.pop_up_button_can_scroll_up(pop_up_button_xpath)
+    simulate_keyboard_event("up-arrow", [])
+  end
+
+  while !app.gui.wait_for_element(pop_up_button_item_xpath, 0.05) && app.gui.pop_up_button_can_scroll_down(pop_up_button_xpath)
+    simulate_keyboard_event("down-arrow", [])
+  end
+
+  if not app.gui.wait_for(pop_up_button_item_xpath)
+    raise "Menu item #{item_name} not found !"
+  end
+
+  simulate_click($mouse_left_click, "image-view-text", "text", item_name, [])
+end
+
+def cappuccino_key(key)
+  if $key_mappings.has_key?(key)
+    key = $key_mappings[key]
+  end
+
+  return key
+end
+
+def create_xpath(element, property, property_value)
+  if !$cappuccino_control_mappings.has_key?(element)
+    raise "Element #{element} not found in the hash cappuccino_control_mappings. You should complete the hash $cappuccino_control_mappings in env.rb"
+  end
+
+  if !$property_mappings.has_key?(property)
+    raise "Property #{property} not found in the hash $property_mappings. You should complete the hash $property_mappings in env.rb"
+  end
+
+  return "//" + $cappuccino_control_mappings[element] + "["+ $property_mappings[property] +"='#{property_value}']"
+end

Tests/CucumberTests/CPAnimationContextTest/features/test_application.feature

@@ -0,0 +1,23 @@
+Feature: Cappuccino animations
+Cappuccino animations powered by css animations
+
+  Scenario: Check if the demo application works
+    Given the application is launched
+    When I click on the button with the property identifier set to run
+    When I wait for 1 second
+    Then the delegate property passed should have the value true
+    When I click on the button with the property identifier set to run
+    When I wait for 1 second
+    Then the delegate property passed should have the value true
+    When I click on the button with the property identifier set to run
+    When I wait for 1 second
+    Then the delegate property passed should have the value true
+    When I click on the button with the property identifier set to run
+    When I wait for 1 second
+    Then the delegate property passed should have the value true
+    When I click on the button with the property identifier set to run
+    When I wait for 1 second
+    Then the delegate property passed should have the value true
+    When I click on the button with the property identifier set to run
+    When I wait for 1 second
+    Then the delegate property passed should have the value true

Tests/CucumberTests/CPAnimationContextTest/index-debug.html

@@ -0,0 +1,204 @@
+<!DOCTYPE html>
+<html lang="en">
+<!--
+ index-debug.html
+ CPAnimationContextTest
+
+ Created by You on May 6, 2016.
+ Copyright 2016, Your Company All rights reserved.
+-->
+    <head>
+        <meta charset="utf-8">
+
+        <!--[if lte IE 8]>
+        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7, chrome=1">
+        <![endif]-->
+        <!--[if gte IE 9]>
+        <meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1">
+        <![endif]-->
+
+        <meta name="viewport" content="initial-scale=1.0, user-scalable=no">
+
+        <meta name="apple-mobile-web-app-capable" content="yes">
+        <meta name="apple-mobile-web-app-status-bar-style" content="black">
+
+        <link rel="apple-touch-icon" href="Resources/icon.png">
+        <link rel="apple-touch-startup-image" href="Resources/default.png">
+
+        <title>CPAnimationContextTest</title>
+
+        <!-- Custom javascript goes here -->
+        <!-- End custom javascript -->
+
+        <script type="text/javascript">
+            OBJJ_MAIN_FILE = "main.j";
+            OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks"];
+            // The below will tell the compiler to generate debug symbols, type signatures and not inline objj_msgSend functions.
+            // This will affect only Objective-J code that is compiled when loading the application. It will not affect precompiled
+            // code like the Cappuccino frameworks.
+            //
+            // Debug symbols will give each Objective-J method a Javascript function name. Without a name it will be very hard to find
+            // the methods in the debugger.
+            // Type Signatures will give type information to the Objective-J runtime for instance variables and methods.
+            // Inline objj_msgSend will give a speed increase but decorators will not work. Check below on debug options for
+            // more information on decorators.
+            //
+            // Uncomment or comment on the line below to change the flags
+            OBJJ_COMPILER_FLAGS = ["IncludeDebugSymbols", "IncludeTypeSignatures"/*, "InlineMsgSend"*/];
+
+            var progressBar = null;
+
+            OBJJ_PROGRESS_CALLBACK = function(percent, appSize, path)
+            {
+                percent = percent * 100;
+
+                if (!progressBar)
+                    progressBar = document.getElementById("progress-bar");
+
+                if (progressBar)
+                    progressBar.style.width = Math.min(percent, 100) + "%";
+            }
+
+            var loadingHTML =
+                    '<div id="loading">' +
+                    '    <div id="loading-text">Loading...</div>' +
+                    '    <div id="progress-indicator">' +
+                    '        <span id="progress-bar" style="width:0%"></span>' +
+                    '    </div>' +
+                    '</div>';
+        </script>
+
+        <script type="text/javascript" src="Frameworks/Debug/Objective-J/Objective-J.js" charset="UTF-8"></script>
+
+        <script type="text/javascript">
+            objj_msgSend_reset();
+
+            // DEBUG OPTIONS:
+            // Decorators will only work when the code is compiled without the compiler option 'InlineMsgSend'. Check above.
+
+            // Uncomment to enable printing of backtraces on exceptions:
+            //objj_msgSend_decorate(objj_backtrace_decorator);
+
+            // Uncomment to supress exceptions that take place inside a message
+            //objj_msgSend_decorate(objj_supress_exceptions_decorator)
+
+            // Uncomment to enable runtime type checking:
+            //objj_msgSend_decorate(objj_typecheck_decorator);
+
+            // Uncomment (along with both above) to print backtraces on type check errors:
+            //objj_typecheck_prints_backtrace = true;
+
+            // Uncomment to disable the default logger (CPLogConsole if window.console exists, CPLogPopup otherwise):
+            //CPLogUnregister(CPLogDefault);
+
+            // Uncomment to enable a specific logger:
+            //CPLogRegister(CPLogConsole);
+            //CPLogRegister(CPLogPopup);
+
+            // Tag view DOM elements with a "data-cappuccino-view" attribute that contains
+            // the class name of the view that created them. Comment this or set to false to disable.
+            appkit_tag_dom_elements = true;
+        </script>
+
+        <style type="text/css">
+            html, body, h1, p {
+                margin: 0;
+                padding: 0;
+            }
+
+            /* We need a body wrapper because Cappuccino is unhappy if we change the body element */
+            #cappuccino-body {
+                /* Position it absolutely so it will fill the height without content */
+                position: absolute;
+                top: 0;
+                bottom: 0;
+                width: 100%;
+
+                /* Put it at the bottom of the stack so it doesn't interfere with UI */
+                z-index: 0;
+            }
+
+            #cappuccino-body .container {
+                display: table;
+                margin: 0 auto;
+                height: 100%;
+            }
+
+            #cappuccino-body .content {
+                display: table-cell;
+                height: 100%;
+                vertical-align: top;
+            }
+
+            #loading {
+                position: relative;
+                top: 35%;
+            }
+
+            #loading-text {
+                height: 1.5em;
+                color: #555;
+                font: normal bold 36px/36px Arial, sans-serif;
+            }
+
+            #progress-indicator {
+                padding: 0px;
+                height: 16px;
+                border: 5px solid #555;
+                border-radius: 18px;
+                background-color: white;
+            }
+
+            #progress-bar {
+                position: relative;
+                top: -1px;
+                left: -1px;
+                display: block;
+                height: 18px;
+
+                /* Compensate for moving the bar left 1px to overlap the indicator border */
+                border-right: 1px solid #555;
+                background-color: #555;
+            }
+
+            #noscript {
+                position: relative;
+                top: 35%;
+                padding: 1em 1.5em;
+                border: 5px solid #555;
+                border-radius: 16px;
+                background-color: white;
+                color: #555;
+                text-align: center;
+                font: bold 24px Arial, sans-serif;
+            }
+
+            #noscript a {
+                color: #98c0ff;
+                text-decoration: none;
+            }
+        </style>
+    </head>
+
+    <body>
+        <div id="cappuccino-body">
+            <div class="container">
+                <div class="content">
+                    <script type="text/javascript">
+                        document.write(loadingHTML);
+                    </script>
+                </div>
+            </div>
+            <noscript style="position:absolute; top:0; left:0; width:100%; height:100%">
+                <div class="container">
+                    <div class="content">
+                        <div id="noscript">
+                            <p style="font-size:120%; margin-bottom:.75em">JavaScript is required for this site.</p>
+                            <p><a href="http://www.enable-javascript.com" target="_blank">Enable JavaScript</a></p>
+                        </div>
+                    </div>
+                </div>
+            </noscript>
+        </div>
+    </body>
+</html>

Tests/CucumberTests/CPAnimationContextTest/index.html

@@ -0,0 +1,166 @@
+<!DOCTYPE html>
+<html lang="en">
+<!--
+ index.html
+ CPAnimationContextTest
+
+ Created by You on May 6, 2016.
+ Copyright 2016, Your Company All rights reserved.
+-->
+    <head>
+        <meta charset="utf-8">
+
+        <!--[if lte IE 8]>
+        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7, chrome=1">
+        <![endif]-->
+        <!--[if gte IE 9]>
+        <meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1">
+        <![endif]-->
+
+        <meta name="viewport" content="initial-scale=1.0, user-scalable=no">
+
+        <meta name="apple-mobile-web-app-capable" content="yes">
+        <meta name="apple-mobile-web-app-status-bar-style" content="black">
+
+        <link rel="apple-touch-icon" href="Resources/icon.png">
+        <link rel="apple-touch-startup-image" href="Resources/default.png">
+
+        <title>CPAnimationContextTest</title>
+
+        <!-- Custom javascript goes here -->
+        <!-- End custom javascript -->
+
+        <script type="text/javascript">
+            OBJJ_MAIN_FILE = "main.j";
+            // The below will tell the compiler to not generate debug symbols but will generate type signatures and inline objj_msgSend functions.
+            // This will affect only Objective-J code that is compiled when loading the application. It will not affect precompiled
+            // code like the Cappuccino frameworks.
+            // Uncomment or comment on the line below to change the flags
+            OBJJ_COMPILER_FLAGS = [/*"IncludeDebugSymbols"*/, "IncludeTypeSignatures", "InlineMsgSend"];
+
+            var progressBar = null;
+
+            OBJJ_PROGRESS_CALLBACK = function(percent, appSize, path)
+            {
+                percent = percent * 100;
+
+                if (!progressBar)
+                    progressBar = document.getElementById("progress-bar");
+
+                if (progressBar)
+                    progressBar.style.width = Math.min(percent, 100) + "%";
+            }
+
+            var loadingHTML =
+                    '<div id="loading">' +
+                    '    <div id="loading-text">Loading...</div>' +
+                    '    <div id="progress-indicator">' +
+                    '        <span id="progress-bar" style="width:0%"></span>' +
+                    '    </div>' +
+                    '</div>';
+        </script>
+
+        <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
+
+        <style type="text/css">
+            html, body, h1, p {
+                margin: 0;
+                padding: 0;
+            }
+
+            /* We need a body wrapper because Cappuccino is unhappy if we change the body element */
+            #cappuccino-body {
+                /* Position it absolutely so it will fill the height without content */
+                position: absolute;
+                top: 0;
+                bottom: 0;
+                width: 100%;
+
+                /* Put it at the bottom of the stack so it doesn't interfere with UI */
+                z-index: 0;
+            }
+
+            #cappuccino-body .container {
+                display: table;
+                margin: 0 auto;
+                height: 100%;
+            }
+
+            #cappuccino-body .content {
+                display: table-cell;
+                height: 100%;
+                vertical-align: top;
+            }
+
+            #loading {
+                position: relative;
+                top: 35%;
+            }
+
+            #loading-text {
+                height: 1.5em;
+                color: #555;
+                font: normal bold 36px/36px Arial, sans-serif;
+            }
+
+            #progress-indicator {
+                padding: 0px;
+                height: 16px;
+                border: 5px solid #555;
+                border-radius: 18px;
+                background-color: white;
+            }
+
+            #progress-bar {
+                position: relative;
+                top: -1px;
+                left: -1px;
+                display: block;
+                height: 18px;
+
+                /* Compensate for moving the bar left 1px to overlap the indicator border */
+                border-right: 1px solid #555;
+                background-color: #555;
+            }
+
+            #noscript {
+                position: relative;
+                top: 35%;
+                padding: 1em 1.5em;
+                border: 5px solid #555;
+                border-radius: 16px;
+                background-color: white;
+                color: #555;
+                text-align: center;
+                font: bold 24px Arial, sans-serif;
+            }
+
+            #noscript a {
+                color: #98c0ff;
+                text-decoration: none;
+            }
+        </style>
+    </head>
+
+    <body>
+        <div id="cappuccino-body">
+            <div class="container">
+                <div class="content">
+                    <script type="text/javascript">
+                        document.write(loadingHTML);
+                    </script>
+                </div>
+            </div>
+            <noscript style="position:absolute; top:0; left:0; width:100%; height:100%">
+                <div class="container">
+                    <div class="content">
+                        <div id="noscript">
+                            <p style="font-size:120%; margin-bottom:.75em">JavaScript is required for this site.</p>
+                            <p><a href="http://www.enable-javascript.com" target="_blank">Enable JavaScript</a></p>
+                        </div>
+                    </div>
+                </div>
+            </noscript>
+        </div>
+    </body>
+</html>

Tests/CucumberTests/CPAnimationContextTest/main.j

@@ -0,0 +1,18 @@
+/*
+ * AppController.j
+ * CPAnimationContextTest
+ *
+ * Created by You on May 6, 2016.
+ * Copyright 2016, Your Company All rights reserved.
+ */
+
+@import <Foundation/Foundation.j>
+@import <AppKit/AppKit.j>
+
+@import "AppController.j"
+
+
+function main(args, namedArgs)
+{
+    CPApplicationMain(args, namedArgs);
+}

Tests/Manual/CGCanvasContext/AppController.j

@@ -50,6 +50,10 @@
     var innerRect = CGRectInset(aRect, CGRectGetWidth(aRect)/2 - 10, CGRectGetHeight(aRect)/2 - 10);
     CGContextStrokeRectWithWidth(context, innerRect, 4);
 
+    CGContextSetTextPosition(context, innerRect.origin.x + 10, innerRect.origin.x + 10);
+    CGContextSetFillColor(context, [CPColor blueColor]);
+    CGContextShowText(context, 'Hello World Canvas!');
+
     [self unlockFocus];
 }
 
@@ -67,7 +71,7 @@
 
     var label = [[CPTextField alloc] initWithFrame:CGRectMakeZero()];
 
-    [label setStringValue:@"Hello World!"];
+    [label setStringValue:@"Do you see the Hello World Canvas?"];
     [label setFont:[CPFont boldSystemFontOfSize:24.0]];
 
     [label sizeToFit];

Tests/Manual/CPSegmentedControlTest/AppController.j

@@ -118,6 +118,13 @@ CPLogRegister(CPLogConsole);
         return;
 }
 
+- (IBAction)enable:(id)sender
+{
+    var enable = [sender state];
+    [segmentedControl1 setEnabled:enable];
+    [segmentedControl2 setEnabled:enable];
+}
+
 - (BOOL)assertTrue:(BOOL)value
 {
     [passedLabel setStringValue:value?@"Passed":@"Failed"];

Tests/Manual/CPTabViewNib/AppController.j

@@ -7,6 +7,7 @@
  */
 @import <AppKit/AppKit.j>
 @import <Foundation/CPObject.j>
+@import "TabViewController.j"
 
 CPLogRegister(CPLogConsole);
 
@@ -15,7 +16,6 @@ CPLogRegister(CPLogConsole);
     CPWindow    theWindow; //this "outlet" is connected automatically by the Cib
     @outlet     CPTabView nibTabView;
     @outlet     CPTabView nibTabViewEmpty;
-    @outlet     CPViewController viewController;
     @outlet     CPStepper insertStepper;
     @outlet     CPStepper removeStepper;
     @outlet     CPButton fromViewController;
@@ -23,23 +23,25 @@ CPLogRegister(CPLogConsole);
 
 - (IBAction)insertTabViewItem:(id)sender
 {
-    var idx = [insertStepper intValue],
-        item;
-
-    if ([fromViewController state])
-        item = [CPTabViewItem tabViewItemWithViewController:viewController];
-    else
-    {
-        item = [[CPTabViewItem alloc] initWithIdentifier:@"Insert" + idx];
-        var view = [[CPView alloc] initWithFrame:CGRectMakeZero()];
-        [view setBackgroundColor:[CPColor randomColor]];
-        [item setView:view];
-        [item setLabel:@"Insert" + idx];
-    }
+    var idx = [insertStepper objectValue];
+    var item = [[CPTabViewItem alloc] initWithIdentifier:@"Insert" + idx];
+    var view = [[CPView alloc] initWithFrame:CGRectMakeZero()];
+    [view setBackgroundColor:[CPColor randomColor]];
+    [item setView:view];
+    [item setLabel:@"Insert" + idx];
 
     [nibTabView insertTabViewItem:item atIndex:idx];
 }
 
+- (IBAction)insertViewControllerTabViewItem:(id)sender
+{
+    var ctl = [[TabViewController alloc] initWithCibName:@"TabViewItem" bundle:nil];
+    [ctl setTitle:@"View Controller"];
+    var item = [CPTabViewItem tabViewItemWithViewController:ctl];
+
+    [nibTabView insertTabViewItem:item atIndex:0];
+}
+
 - (IBAction)removeTabViewItem:(id)sender
 {
     var idx = [removeStepper intValue],

Tests/Manual/CPTabViewNib/Resources/CollectionViewItem.xib

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10117" systemVersion="15E65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10117"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="NSViewController">
+            <connections>
+                <outlet property="view" destination="c22-O7-iKe" id="qxT-KH-2c6"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <customView id="c22-O7-iKe" customClass="CPView">
+            <rect key="frame" x="0.0" y="0.0" width="90" height="40"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+            <subviews>
+                <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="2mc-qc-fMw">
+                    <rect key="frame" x="3" y="2" width="81" height="32"/>
+                    <buttonCell key="cell" type="push" title="Button" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="Xfn-8O-d0Z">
+                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                        <font key="font" metaFont="system"/>
+                    </buttonCell>
+                    <connections>
+                        <binding destination="-2" name="title" keyPath="representedObject" id="r8y-dc-uru"/>
+                    </connections>
+                </button>
+            </subviews>
+            <point key="canvasLocation" x="218" y="301"/>
+        </customView>
+    </objects>
+</document>

Tests/Manual/CPTabViewNib/Resources/TabViewItem.xib

@@ -1,31 +1,44 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="6751" systemVersion="14C109" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="11191" systemVersion="15G31" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" customObjectInstantitationMethod="direct">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="6751"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="11191"/>
+        <capability name="box content view" minToolsVersion="7.0"/>
     </dependencies>
     <objects>
-        <customObject id="-2" userLabel="File's Owner" customClass="NSViewController">
+        <customObject id="-2" userLabel="File's Owner" customClass="TabViewController">
             <connections>
-                <outlet property="view" destination="c22-O7-iKe" id="DCH-07-kCx"/>
+                <outlet property="view" destination="8Ad-lT-bWg" id="p21-3P-cjc"/>
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
         <customObject id="-3" userLabel="Application" customClass="NSObject"/>
-        <customView id="c22-O7-iKe" customClass="CPView">
-            <rect key="frame" x="0.0" y="0.0" width="406" height="263"/>
-            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+        <customView misplaced="YES" id="8Ad-lT-bWg" customClass="CPView">
+            <rect key="frame" x="0.0" y="0.0" width="279" height="203"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" id="FdY-tR-zTk">
-                    <rect key="frame" x="97" y="120" width="212" height="22"/>
-                    <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                    <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" borderStyle="bezel" alignment="center" title="CPViewController TabViewItem" id="z8j-pD-CWg">
-                        <font key="font" metaFont="system"/>
-                        <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                    </textFieldCell>
-                </textField>
+                <box misplaced="YES" boxType="custom" cornerRadius="4" title="Box" titlePosition="noTitle" id="9We-aw-hQG">
+                    <rect key="frame" x="0.0" y="0.0" width="279" height="203"/>
+                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                    <view key="contentView" id="agn-Mc-GSl">
+                        <rect key="frame" x="1" y="1" width="277" height="201"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" misplaced="YES" id="Pte-FL-dac">
+                                <rect key="frame" x="18" y="92" width="241" height="17"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+                                <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" title="This view was loaded asynchronously" id="gqq-al-SMS">
+                                    <font key="font" metaFont="system"/>
+                                    <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                    <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
+                                </textFieldCell>
+                            </textField>
+                        </subviews>
+                    </view>
+                    <color key="fillColor" red="0.28570679530201343" green="0.55335046140939592" blue="0.72320679530201337" alpha="1" colorSpace="calibratedRGB"/>
+                </box>
             </subviews>
-            <point key="canvasLocation" x="376" y="412.5"/>
+            <point key="canvasLocation" x="185.5" y="313.5"/>
         </customView>
+        <collectionViewItem nibName="CollectionViewItem" id="fGB-7s-LKj"/>
     </objects>
 </document>

Tests/Manual/CPTabViewNib/TabViewController.j

@@ -0,0 +1,13 @@
+@implementation TabViewController : CPViewController
+{
+}
+
+- (void)viewDidAppear
+{
+    CPLog.debug(_cmd);
+    var view = [self view];
+
+    [view setFrameSize:[[view superview] frameSize]];
+}
+
+@end

Tests/Manual/CPTextView/AppController.j

@@ -0,0 +1,105 @@
+/*
+ * AppController.j
+ *
+ *  Manual test application for the cappuccino text system
+ *  Copyright (C) 2014 Daniel Boehringer
+ */
+
+@import <Foundation/Foundation.j>
+@import <AppKit/CPTextView.j>
+@import <AppKit/CPFontPanel.j>
+
+@implementation AppController : CPObject
+{
+    CPTextView  _textView;
+    CPTextView  _textView2;
+}
+
+- (void)orderFrontFontPanel:(id)sender
+{
+   [[CPFontManager sharedFontManager] orderFrontFontPanel:self];
+}
+
+- (void)applicationDidFinishLaunching:(CPNotification)aNotification
+{
+   // CPLogRegister(CPLogConsole);
+
+    var theWindow = [[CPWindow alloc] initWithContentRect:CGRectMakeZero() styleMask:CPBorderlessBridgeWindowMask],
+        contentView = [theWindow contentView];
+
+    [contentView setBackgroundColor:[CPColor colorWithWhite:0.95 alpha:1.0]];
+
+    _textView = [[CPTextView alloc] initWithFrame:CGRectMake(0,0,500,500)];
+    [_textView setRichText:YES];
+
+    _textView2 = [[CPTextView alloc] initWithFrame:CGRectMake(0,0,500,500)];
+    _textView2._isRichText = NO;
+    [_textView setBackgroundColor:[CPColor whiteColor]];
+    [_textView2 setBackgroundColor:[CPColor whiteColor]];
+   
+    var scrollView = [[CPScrollView alloc] initWithFrame:CGRectMake(20, 20,520,510)];
+    var scrollView2 = [[CPScrollView alloc] initWithFrame:CGRectMake(560, 20,520,510)];
+    // [scrollView setAutohidesScrollers:YES];
+    [scrollView setDocumentView:_textView];
+    [scrollView2 setDocumentView:_textView2];
+    //
+    [contentView addSubview: scrollView];
+    [contentView addSubview: scrollView2];
+   //
+   // [_textView setDelegate:self];
+   //
+   // build our menu
+   var mainMenu = [CPApp mainMenu];
+
+   while ([mainMenu numberOfItems] > 0)
+       [mainMenu removeItemAtIndex:0];
+
+   var item = [mainMenu insertItemWithTitle:@"Edit" action:nil keyEquivalent:nil atIndex:0],
+       editMenu = [[CPMenu alloc] initWithTitle:@"Edit Menu"];
+
+   [editMenu addItemWithTitle:@"Cut" action:@selector(cut:) keyEquivalent:@"x"];
+   [editMenu addItemWithTitle:@"Copy" action:@selector(copy:) keyEquivalent:@"c"];
+   [editMenu addItemWithTitle:@"Paste" action:@selector(paste:) keyEquivalent:@"v"];
+   [editMenu addItemWithTitle:@"Delete" action:@selector(delete:) keyEquivalent:@""];
+   [editMenu addItemWithTitle:@"Select All" action:@selector(selectAll:) keyEquivalent:@"a"];
+   [editMenu addItemWithTitle:@"Undo" action:@selector(undo:) keyEquivalent:@"z"];
+   [editMenu addItemWithTitle:@"Redo" action:@selector(redo:) keyEquivalent:@"Z"];
+
+   [mainMenu setSubmenu:editMenu forItem:item];
+
+   item = [mainMenu insertItemWithTitle:@"Format" action:nil keyEquivalent:nil atIndex:0];
+   var formatMenu = [[CPMenu alloc] initWithTitle:@"Format Menu"];
+   [formatMenu addItemWithTitle:@"Font panel" action:@selector(orderFrontFontPanel:) keyEquivalent:@"f"];
+   [mainMenu setSubmenu:formatMenu forItem:item];
+
+   //
+   //  var centeredParagraph=[CPParagraphStyle new];
+   //  [centeredParagraph setAlignment: CPCenterTextAlignment];
+   //  [_textView insertText:[[CPAttributedString alloc] initWithString:@"Fusce\n"
+   //             attributes:[CPDictionary dictionaryWithObjects:[centeredParagraph, [CPFont boldFontWithName:"Arial" size:18], [CPColor redColor]]
+   //                                      forKeys:[CPParagraphStyleAttributeName, CPFontAttributeName, CPForegroundColorAttributeName]]]];
+   //
+   //  [_textView insertText: [[CPAttributedString alloc] initWithString:@"lectus neque cr     as eget lectus neque cr as eget lectus cr as eget lectus"
+   //              attributes:[CPDictionary dictionaryWithObjects:[ [CPFont fontWithName:"Arial" size:12]] forKeys: [CPFontAttributeName]]]];
+   //
+   //  [_textView insertText:[[CPAttributedString alloc] initWithString:@" proin, this is text in boldface "
+   //              attributes:[CPDictionary dictionaryWithObjects:[ [CPFont boldFontWithName:"Arial" size:12]] forKeys: [CPFontAttributeName]]]];
+   //  [_textView insertText:[[CPAttributedString alloc] initWithString:@"111111 neque cr as eget lectus neque cr as eget lectus cr as eget lectus"
+   //              attributes:[CPDictionary dictionaryWithObjects:[ [CPFont fontWithName:"Arial" size:12.0]] forKeys: [CPFontAttributeName]]]];
+   //
+    [theWindow orderFront:self];
+    [CPMenu setMenuBarVisible:YES];
+}
+
+//
+// - (void) makeRTF:sender
+// {
+//    [_textView2 setString: [_CPRTFProducer produceRTF:[_textView textStorage] documentAttributes: @{}] ];
+//    var tc = [_CPRTFParser new];
+//    var mystr=[tc parseRTF:[_textView2 stringValue]];
+//    [_textView selectAll: self];
+//    [_textView insertText: mystr];
+//
+// }
+
+@end

Tests/Manual/CPTextView/Info.plist

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+    <key>CPApplicationDelegateClass</key>
+    <string>AppController</string>
+    <key>CPBundleName</key>
+    <string>CPTextViewTest</string>
+    <key>CPPrincipalClass</key>
+    <string>CPApplication</string>
+</dict>
+</plist>

Tests/Manual/CPTextView/Jakefile

@@ -0,0 +1,94 @@
+/*
+ * Jakefile
+ * CPLevelIndicator
+ *
+ * Created by Alexander Ljungberg on May 28, 2011.
+ * Copyright 2011, WireLoad All rights reserved.
+ */
+
+var ENV = require("system").env,
+    FILE = require("file"),
+    JAKE = require("jake"),
+    task = JAKE.task,
+    FileList = JAKE.FileList,
+    app = require("cappuccino/jake").app,
+    configuration = ENV["CONFIG"] || ENV["CONFIGURATION"] || ENV["c"] || "Debug",
+    OS = require("os");
+
+app ("CPLevelIndicator", function(task)
+{
+    task.setBuildIntermediatesPath(FILE.join("Build", "CPLevelIndicator.build", configuration));
+    task.setBuildPath(FILE.join("Build", configuration));
+
+    task.setProductName("CPLevelIndicator");
+    task.setIdentifier("com.yourcompany.CPLevelIndicator");
+    task.setVersion("1.0");
+    task.setAuthor("WireLoad");
+    task.setEmail("feedback @nospam@ yourcompany.com");
+    task.setSummary("CPLevelIndicator");
+    task.setSources((new FileList("**/*.j")).exclude(FILE.join("Build", "**")));
+    task.setResources(new FileList("Resources/**"));
+    task.setIndexFilePath("index.html");
+    task.setInfoPlistPath("Info.plist");
+    task.setNib2CibFlags("-R Resources/");
+
+    if (configuration === "Debug")
+        task.setCompilerFlags("-DDEBUG -g");
+    else
+        task.setCompilerFlags("-O");
+});
+
+task ("default", ["CPLevelIndicator"], function()
+{
+    printResults(configuration);
+});
+
+task ("build", ["default"]);
+
+task ("debug", function()
+{
+    ENV["CONFIGURATION"] = "Debug";
+    JAKE.subjake(["."], "build", ENV);
+});
+
+task ("release", function()
+{
+    ENV["CONFIGURATION"] = "Release";
+    JAKE.subjake(["."], "build", ENV);
+});
+
+task ("run", ["debug"], function()
+{
+    OS.system(["open", FILE.join("Build", "Debug", "CPLevelIndicator", "index.html")]);
+});
+
+task ("run-release", ["release"], function()
+{
+    OS.system(["open", FILE.join("Build", "Release", "CPLevelIndicator", "index.html")]);
+});
+
+task ("deploy", ["release"], function()
+{
+    FILE.mkdirs(FILE.join("Build", "Deployment", "CPLevelIndicator"));
+    OS.system(["press", "-f", FILE.join("Build", "Release", "CPLevelIndicator"), FILE.join("Build", "Deployment", "CPLevelIndicator")]);
+    printResults("Deployment")
+});
+
+task ("desktop", ["release"], function()
+{
+    FILE.mkdirs(FILE.join("Build", "Desktop", "CPLevelIndicator"));
+    require("cappuccino/nativehost").buildNativeHost(FILE.join("Build", "Release", "CPLevelIndicator"), FILE.join("Build", "Desktop", "CPLevelIndicator", "CPLevelIndicator.app"));
+    printResults("Desktop")
+});
+
+task ("run-desktop", ["desktop"], function()
+{
+    OS.system([FILE.join("Build", "Desktop", "CPLevelIndicator", "CPLevelIndicator.app", "Contents", "MacOS", "NativeHost"), "-i"]);
+});
+
+function printResults(configuration)
+{
+    print("----------------------------");
+    print(configuration+" app built at path: "+FILE.join("Build", configuration, "CPLevelIndicator"));
+    print("----------------------------");
+}

Tests/Manual/CPTextView/index-debug.html

@@ -0,0 +1,103 @@
+<!DOCTYPE html
+    PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
+    "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<!--
+ index-debug.html
+ CPLevelIndicator
+
+ Created by Alexander Ljungberg on May 28, 2011.
+ Copyright 2011, WireLoad All rights reserved.
+-->
+    <head>
+        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7, chrome=1" />
+
+        <meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
+
+        <meta name="apple-mobile-web-app-capable" content="yes" />
+        <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+
+        <link rel="apple-touch-icon" href="Resources/icon.png" />
+        <link rel="apple-touch-startup-image" href="Resources/default.png" />
+
+        <title>CPLevelIndicator</title>
+
+        <script type="text/javascript">
+            OBJJ_MAIN_FILE = "main.j";
+            OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks", "SomethingElse"];
+        </script>
+
+        <script type="text/javascript" src="Frameworks/Debug/Objective-J/Objective-J.js" charset="UTF-8"></script>
+
+        <script type="text/javascript">
+            objj_msgSend_reset();
+
+            // DEBUG OPTIONS:
+
+            // Uncomment to enable printing of backtraces on exceptions:
+            //objj_msgSend_decorate(objj_backtrace_decorator);
+
+            // Uncomment to supress exceptions that take place inside a message
+            //objj_msgSend_decorate(objj_supress_exceptions_decorator)
+
+            // Uncomment to enable runtime type checking:
+            //objj_msgSend_decorate(objj_typecheck_decorator);
+
+            // Uncomment (along with both above) to print backtraces on type check errors:
+            //objj_typecheck_prints_backtrace = true;
+
+            // Uncomment to disable the default logger (CPLogConsole if window.console exists, CPLogPopup otherwise):
+            //CPLogUnregister(CPLogDefault);
+
+            // Uncomment to enable a specific logger:
+            //CPLogRegister(CPLogConsole);
+            //CPLogRegister(CPLogPopup);
+        </script>
+
+        <style type="text/css">
+            body{margin:0; padding:0;}
+            #container {position: absolute; top:50%; left:50%;}
+            #content {width:800px; text-align:center; margin-left: -400px; height:50px; margin-top:-25px; line-height: 50px;}
+            #content {font-family: "Helvetica", "Arial", sans-serif; font-size: 18px; color: black; text-shadow: 0px 1px 0px white; }
+            #loadgraphic {margin-right: 0.2em; margin-bottom:-2px;}
+        </style>
+
+        <!--[if lt IE 7]>
+        <STYLE type="text/css">
+            #container { position: relative; top: 50%; }
+            #content { position: relative;}
+        </STYLE>
+        <![endif]-->
+
+    </head>
+
+    <body style="">
+        <div id="cappuccino-body">
+            <div id="loadingcontainer" style="background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;">
+                <script type="text/javascript">
+                    document.write("<div id='container'><p id='content'>" +
+                                   "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
+                                   "Loading CPLevelIndicator...</p></div>");
+                </script>
+
+                <noscript>
+                    <div id="container">
+                        <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
+                            <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
+                            <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
+                                <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
+                                <li style="display: inline;"><a href="http://www.mozilla.com/en-US/firefox/">Firefox</a></li>
+                                <li style="display: inline;"><a href="http://www.google.com/chrome/">Chrome</a></li>
+                                <li style="display: inline;"><a href="http://www.opera.com/download/">Opera</a></li>
+                                <li style="display: inline;"><a href="http://www.microsoft.com/windows/downloads/ie/getitnow.mspx">Internet Explorer</a></li>
+                            </ul>
+                        </div>
+                    </div>
+                </noscript>
+            </div>
+        </div>
+    </body>
+
+</html>

Tests/Manual/CPTextView/index.html

@@ -0,0 +1,74 @@
+<html>
+<!--
+ index.html
+ CPLevelIndicator
+
+ Created by Alexander Ljungberg on May 28, 2011.
+ Copyright 2011, WireLoad All rights reserved.
+-->
+    <head>
+        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7, chrome=1" />
+
+        <meta name="viewport" content="initial-scale=1.0, user-scalable=no" />
+
+        <meta name="apple-mobile-web-app-capable" content="yes" />
+        <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+
+        <link rel="apple-touch-icon" href="Resources/icon.png" />
+        <link rel="apple-touch-startup-image" href="Resources/default.png" />
+
+        <title>CPTextView</title>
+
+        <script type="text/javascript">
+            OBJJ_MAIN_FILE = "main.j";
+        </script>
+
+        <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
+
+        <style type="text/css">
+            body{margin:0; padding:0;}
+            #container {position: absolute; top:50%; left:50%;}
+            #content {width:800px; text-align:center; margin-left: -400px; height:50px; margin-top:-25px; line-height: 50px;}
+            #content {font-family: "Helvetica", "Arial", sans-serif; font-size: 18px; color: black; text-shadow: 0px 1px 0px white; }
+            #loadgraphic {margin-right: 0.2em; margin-bottom:-2px;}
+        </style>
+
+        <!--[if lt IE 7]>
+        <STYLE type="text/css">
+            #container { position: relative; top: 50%; }
+            #content { position: relative;}
+        </STYLE>
+        <![endif]-->
+
+    </head>
+
+    <body style="">
+        <div id="cappuccino-body">
+            <div id="loadingcontainer" style="background-color: #eeeeee; overflow:hidden; width:100%; height:100%; position: absolute; top: 0; left: 0;">
+                <script type="text/javascript">
+                    document.write("<div id='container'><p id='content'>" +
+                                   "<img id='loadgraphic' width='16' height='16' src='Resources/spinner.gif' /> " +
+                                   "Loading CPLevelIndicator...</p></div>");
+                </script>
+
+                <noscript>
+                    <div id="container">
+                        <div style="width: 440px; padding: 10px 25px 20px 25px; font-family: sans-serif; background-color: #ffffff; position: relative; left: -245px; top: -120px; text-align: center; -moz-border-radius: 20px; -webkit-border-radius: 20px; color: #555555">
+                            <p style="line-height: 1.4em;">JavaScript is required for this site to work correctly but is either disabled or not supported by your browser.</p>
+                            <p style="font-size:120%; padding:10px;"><a href="http://cappuccino-project.org/noscript">Show me how to enable JavaScript</a></p>
+                            <p style="font-size:80%;">You may want to upgrade to a newer browser while you're at it:</p>
+                            <ul style="margin:0;padding:0; text-align: center; font-size:80%;" >
+                                <li style="display: inline;"><a href="http://www.apple.com/safari/download/">Safari</a></li>
+                                <li style="display: inline;"><a href="http://www.mozilla.com/en-US/firefox/">Firefox</a></li>
+                                <li style="display: inline;"><a href="http://www.google.com/chrome/">Chrome</a></li>
+                                <li style="display: inline;"><a href="http://www.opera.com/download/">Opera</a></li>
+                                <li style="display: inline;"><a href="http://www.microsoft.com/windows/downloads/ie/getitnow.mspx">Internet Explorer</a></li>
+                            </ul>
+                        </div>
+                    </div>
+                </noscript>
+            </div>
+        </div>
+    </body>
+
+</html>

Tests/Manual/CPTextView/main.j

@@ -0,0 +1,18 @@
+/*
+ * AppController.j
+ * CPLevelIndicator
+ *
+ * Created by Alexander Ljungberg on May 28, 2011.
+ * Copyright 2011, WireLoad All rights reserved.
+ */
+
+@import <Foundation/Foundation.j>
+@import <AppKit/AppKit.j>
+
+@import "AppController.j"
+
+
+function main(args, namedArgs)
+{
+    CPApplicationMain(args, namedArgs);
+}

Tests/Manual/CPTextViewCibTest/AppController.j

@@ -0,0 +1,34 @@
+/*
+ * AppController.j
+ * CPTextViewCibTest
+ *
+ * Created by You on June 4, 2014.
+ * Copyright 2014, Your Company All rights reserved.
+ */
+
+@import <Foundation/Foundation.j>
+@import <AppKit/AppKit.j>
+
+
+@implementation AppController : CPObject
+{
+    @outlet CPWindow    theWindow;
+    @outlet CPTextView  textView;
+}
+
+- (void)applicationDidFinishLaunching:(CPNotification)aNotification
+{
+    // This is called when the application is done loading.
+}
+
+- (void)awakeFromCib
+{
+    // This is called when the cib is done loading.
+    // You can implement this method on any object instantiated from a Cib.
+    // It's a useful hook for setting up current UI values, and other things.
+
+    // In this case, we want the window from Cib to become our full browser window
+    [theWindow setFullPlatformWindow:YES];
+}
+
+@end

Tests/Manual/CPTextViewCibTest/Info.plist

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>Main cib file base name</key>
+	<string>MainMenu.cib</string>
+	<key>CPBundleName</key>
+	<string>CPTextViewCibTest</string>
+    <key>CPBundleVersion</key>
+    <string>1.0</string>
+    <key>CPHumanReadableCopyright</key>
+    <string>Copyright © 2014, Your Company All rights reserved.</string>
+</dict>
+</plist>

Tests/Manual/CPTextViewCibTest/Jakefile

@@ -0,0 +1,184 @@
+/*
+ * Jakefile
+ * CPTextViewCibTest
+ *
+ * Created by You on June 4, 2014.
+ * Copyright 2014, Your Company All rights reserved.
+ */
+
+var ENV = require("system").env,
+    FILE = require("file"),
+    JAKE = require("jake"),
+    task = JAKE.task,
+    FileList = JAKE.FileList,
+    app = require("cappuccino/jake").app,
+    configuration = ENV["CONFIG"] || ENV["CONFIGURATION"] || ENV["c"] || "Debug",
+    OS = require("os"),
+    projectName = "CPTextViewCibTest";
+
+app (projectName, function(task)
+{
+    ENV["OBJJ_INCLUDE_PATHS"] = "Frameworks";
+
+    if (configuration === "Debug")
+        ENV["OBJJ_INCLUDE_PATHS"] = FILE.join(ENV["OBJJ_INCLUDE_PATHS"], configuration);
+
+    task.setBuildIntermediatesPath(FILE.join("Build", "CPTextViewCibTest.build", configuration));
+    task.setBuildPath(FILE.join("Build", configuration));
+
+    task.setProductName("CPTextViewCibTest");
+    task.setIdentifier("com.yourcompany.CPTextViewCibTest");
+    task.setVersion("1.0");
+    task.setAuthor("Your Company");
+    task.setEmail("feedback @nospam@ yourcompany.com");
+    task.setSummary("CPTextViewCibTest");
+    task.setSources(new FileList("**/*.j").exclude(FILE.join("Build", "**")).exclude(FILE.join("Frameworks", "Source", "**")));
+    task.setResources(new FileList("Resources/**"));
+    task.setIndexFilePath("index.html");
+    task.setInfoPlistPath("Info.plist");
+
+    if (configuration === "Debug")
+        task.setCompilerFlags("-DDEBUG -g");
+    else
+        task.setCompilerFlags("-O");
+});
+
+task ("default", [projectName], function()
+{
+    printResults(configuration);
+});
+
+task ("build", ["default"], function()
+{
+    updateApplicationSize();
+});
+
+task ("debug", function()
+{
+    ENV["CONFIGURATION"] = "Debug";
+    JAKE.subjake(["."], "build", ENV);
+});
+
+task ("release", function()
+{
+    ENV["CONFIGURATION"] = "Release";
+    JAKE.subjake(["."], "build", ENV);
+});
+
+task ("run", ["debug"], function()
+{
+    OS.system(["open", FILE.join("Build", "Debug", projectName, "index.html")]);
+});
+
+task ("run-release", ["release"], function()
+{
+    OS.system(["open", FILE.join("Build", "Release", projectName, "index.html")]);
+});
+
+task ("deploy", ["release"], function()
+{
+    FILE.mkdirs(FILE.join("Build", "Deployment", projectName));
+    OS.system(["press", "-f", FILE.join("Build", "Release", projectName), FILE.join("Build", "Deployment", projectName)]);
+    printResults("Deployment")
+});
+
+task ("desktop", ["release"], function()
+{
+    FILE.mkdirs(FILE.join("Build", "Desktop", projectName));
+    require("cappuccino/nativehost").buildNativeHost(FILE.join("Build", "Release", projectName), FILE.join("Build", "Desktop", projectName, "CPTextViewCibTest.app"));
+    printResults("Desktop")
+});
+
+task ("run-desktop", ["desktop"], function()
+{
+    OS.system([FILE.join("Build", "Desktop", projectName, "CPTextViewCibTest.app", "Contents", "MacOS", "NativeHost"), "-i"]);
+});
+
+function printResults(configuration)
+{
+    print("----------------------------");
+    print(configuration+" app built at path: "+FILE.join("Build", configuration, projectName));
+    print("----------------------------");
+}
+
+function updateApplicationSize()
+{
+    print("Calculating application file sizes...");
+
+    var contents = FILE.read(FILE.join("Build", ENV["CONFIGURATION"], projectName, "Info.plist"), { charset:"UTF-8" }),
+        format = CFPropertyList.sniffedFormatOfString(contents),
+        plist = CFPropertyList.propertyListFromString(contents),
+        totalBytes = {executable:0, data:0, mhtml:0};
+
+    // Get the size of all framework executables and sprite data
+    var frameworksDir = "Frameworks";
+
+    if (ENV["CONFIGURATION"] === "Debug")
+        frameworksDir = FILE.join(frameworksDir, "Debug");
+
+    var frameworks = FILE.list(frameworksDir);
+
+    frameworks.forEach(function(framework)
+    {
+        if (framework !== "Source")
+            addBundleFileSizes(FILE.join(frameworksDir, framework), totalBytes);
+    });
+
+    // Read in the default theme name, and attempt to get its size
+    var themeName = plist.valueForKey("CPDefaultTheme") || "Aristo2",
+        themePath = nil;
+
+    if (themeName === "Aristo" || themeName === "Aristo2")
+        themePath = FILE.join(frameworksDir, "AppKit", "Resources", themeName + ".blend");
+    else
+        themePath = FILE.join("Frameworks", "Resources", themeName + ".blend");
+
+    if (FILE.isDirectory(themePath))
+        addBundleFileSizes(themePath, totalBytes);
+
+    // Add sizes for the app
+    addBundleFileSizes(FILE.join("Build", ENV["CONFIGURATION"], projectName), totalBytes);
+
+    print("Executables: " + totalBytes.executable + ", sprite data: " + totalBytes.data + ", total: " + (totalBytes.executable + totalBytes.data));
+
+    var dict = new CFMutableDictionary();
+
+    dict.setValueForKey("executable", totalBytes.executable);
+    dict.setValueForKey("data", totalBytes.data);
+    dict.setValueForKey("mhtml", totalBytes.mhtml);
+
+    plist.setValueForKey("CPApplicationSize", dict);
+
+    FILE.write(FILE.join("Build", ENV["CONFIGURATION"], projectName, "Info.plist"), CFPropertyList.stringFromPropertyList(plist, format), { charset:"UTF-8" });
+}
+
+function addBundleFileSizes(bundlePath, totalBytes)
+{
+    var bundleName = FILE.basename(bundlePath),
+        environment = bundleName === "Foundation" ? "Objj" : "Browser",
+        bundlePath = FILE.join(bundlePath, environment + ".environment");
+
+    if (FILE.isDirectory(bundlePath))
+    {
+        var filename = bundleName + ".sj",
+            filePath = new FILE.Path(FILE.join(bundlePath, filename));
+
+        if (filePath.exists())
+            totalBytes.executable += filePath.size();
+
+        filePath = new FILE.Path(FILE.join(bundlePath, "dataURLs.txt"));
+
+        if (filePath.exists())
+            totalBytes.data += filePath.size();
+
+        filePath = new FILE.Path(FILE.join(bundlePath, "MHTMLData.txt"));
+
+        if (filePath.exists())
+            totalBytes.mhtml += filePath.size();
+
+        filePath = new FILE.Path(FILE.join(bundlePath, "MHTMLPaths.txt"));
+
+        if (filePath.exists())
+            totalBytes.mhtml += filePath.size();
+    }
+}

Tests/Manual/CPTextViewCibTest/Resources/MainMenu.xib

@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="9532" systemVersion="15D21" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none">
+    <dependencies>
+        <deployment version="1050" identifier="macosx"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="NSApplication">
+            <connections>
+                <outlet property="delegate" destination="450" id="451"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="371">
+            <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
+            <windowPositionMask key="initialPositionMask" leftStrut="YES" bottomStrut="YES"/>
+            <rect key="contentRect" x="335" y="390" width="480" height="360"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="878"/>
+            <view key="contentView" id="372">
+                <rect key="frame" x="0.0" y="0.0" width="480" height="360"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <scrollView horizontalLineScroll="10" horizontalPageScroll="10" verticalLineScroll="10" verticalPageScroll="10" hasHorizontalScroller="NO" usesPredominantAxisScrolling="NO" id="jll-qG-fPP">
+                        <rect key="frame" x="20" y="20" width="448" height="320"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                        <clipView key="contentView" id="iXp-AZ-pxs">
+                            <rect key="frame" x="1" y="1" width="238" height="133"/>
+                            <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                            <subviews>
+                                <textView identifier="vfokrt" importsGraphics="NO" findStyle="panel" continuousSpellChecking="YES" allowsUndo="YES" usesRuler="YES" usesFontPanel="YES" verticallyResizable="YES" allowsNonContiguousLayout="YES" quoteSubstitution="YES" dashSubstitution="YES" spellingCorrection="YES" smartInsertDelete="YES" id="lio-7d-ZF1">
+                                    <rect key="frame" x="0.0" y="0.0" width="446" height="318"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                    <color key="textColor" red="1" green="0.30493083910000002" blue="0.37424202039999999" alpha="1" colorSpace="calibratedRGB"/>
+                                    <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                    <size key="minSize" width="431" height="318"/>
+                                    <size key="maxSize" width="463" height="10000000"/>
+                                    <attributedString key="textStorage">
+                                        <fragment content="Je suis un CPTextView">
+                                            <attributes>
+                                                <color key="NSColor" red="1" green="0.30493083910000002" blue="0.37424202039999999" alpha="1" colorSpace="calibratedRGB"/>
+                                                <font key="NSFont" size="16" name="Arial-Black"/>
+                                                <paragraphStyle key="NSParagraphStyle" alignment="natural" lineBreakMode="wordWrapping" baseWritingDirection="natural"/>
+                                            </attributes>
+                                        </fragment>
+                                    </attributedString>
+                                    <color key="insertionPointColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+                                    <size key="minSize" width="431" height="318"/>
+                                    <size key="maxSize" width="463" height="10000000"/>
+                                    <connections>
+                                        <outlet property="delegate" destination="450" id="TUv-WJ-Fxj"/>
+                                    </connections>
+                                </textView>
+                            </subviews>
+                            <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        </clipView>
+                        <scroller key="horizontalScroller" hidden="YES" verticalHuggingPriority="750" doubleValue="1" horizontal="YES" id="tou-bI-pKK">
+                            <rect key="frame" x="-100" y="-100" width="87" height="18"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                        </scroller>
+                        <scroller key="verticalScroller" verticalHuggingPriority="750" doubleValue="1" horizontal="NO" id="HzS-T1-0kM">
+                            <rect key="frame" x="432" y="1" width="15" height="318"/>
+                            <autoresizingMask key="autoresizingMask"/>
+                        </scroller>
+                    </scrollView>
+                </subviews>
+            </view>
+            <point key="canvasLocation" x="288" y="319"/>
+        </window>
+        <customObject id="450" customClass="AppController">
+            <connections>
+                <outlet property="textView" destination="lio-7d-ZF1" id="kEd-6Q-HGK"/>
+                <outlet property="theWindow" destination="371" id="459"/>
+            </connections>
+        </customObject>
+    </objects>
+</document>

Tests/Manual/CPTextViewCibTest/index-debug.html

@@ -0,0 +1,191 @@
+<!DOCTYPE html>
+<html lang="en">
+<!--
+ index-debug.html
+ CPTextViewCibTest
+
+ Created by You on June 4, 2014.
+ Copyright 2014, Your Company All rights reserved.
+-->
+    <head>
+        <meta charset="utf-8">
+
+        <!--[if lte IE 8]>
+        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7, chrome=1">
+        <![endif]-->
+        <!--[if gte IE 9]>
+        <meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1">
+        <![endif]-->
+
+        <meta name="viewport" content="initial-scale=1.0, user-scalable=no">
+
+        <meta name="apple-mobile-web-app-capable" content="yes">
+        <meta name="apple-mobile-web-app-status-bar-style" content="black">
+
+        <link rel="apple-touch-icon" href="Resources/icon.png">
+        <link rel="apple-touch-startup-image" href="Resources/default.png">
+
+        <title>CPTextViewCibTest</title>
+
+        <!-- Custom javascript goes here -->
+        <!-- End custom javascript -->
+
+        <script type="text/javascript">
+            OBJJ_MAIN_FILE = "main.j";
+            OBJJ_INCLUDE_PATHS = ["Frameworks/Debug", "Frameworks"];
+
+            var progressBar = null;
+
+            OBJJ_PROGRESS_CALLBACK = function(percent, appSize, path)
+            {
+                percent = percent * 100;
+
+                if (!progressBar)
+                    progressBar = document.getElementById("progress-bar");
+
+                if (progressBar)
+                    progressBar.style.width = Math.min(percent, 100) + "%";
+            }
+
+            var loadingHTML =
+                    '<div id="loading">' +
+                    '    <div id="loading-text">Loading...</div>' +
+                    '    <div id="progress-indicator">' +
+                    '        <span id="progress-bar" style="width:0%"></span>' +
+                    '    </div>' +
+                    '</div>';
+        </script>
+
+        <script type="text/javascript" src="Frameworks/Debug/Objective-J/Objective-J.js" charset="UTF-8"></script>
+
+        <script type="text/javascript">
+            objj_msgSend_reset();
+
+            // DEBUG OPTIONS:
+
+            // Uncomment to enable printing of backtraces on exceptions:
+            //objj_msgSend_decorate(objj_backtrace_decorator);
+
+            // Uncomment to supress exceptions that take place inside a message
+            //objj_msgSend_decorate(objj_supress_exceptions_decorator)
+
+            // Uncomment to enable runtime type checking:
+            //objj_msgSend_decorate(objj_typecheck_decorator);
+
+            // Uncomment (along with both above) to print backtraces on type check errors:
+            //objj_typecheck_prints_backtrace = true;
+
+            // Uncomment to disable the default logger (CPLogConsole if window.console exists, CPLogPopup otherwise):
+            //CPLogUnregister(CPLogDefault);
+
+            // Uncomment to enable a specific logger:
+            //CPLogRegister(CPLogConsole);
+            //CPLogRegister(CPLogPopup);
+
+            // Tag view DOM elements with a "data-cappuccino-view" attribute that contains
+            // the class name of the view that created them. Comment this or set to false to disable.
+            appkit_tag_dom_elements = true;
+        </script>
+
+        <style type="text/css">
+            html, body, h1, p {
+                margin: 0;
+                padding: 0;
+            }
+
+            /* We need a body wrapper because Cappuccino is unhappy if we change the body element */
+            #cappuccino-body {
+                /* Position it absolutely so it will fill the height without content */
+                position: absolute;
+                top: 0;
+                bottom: 0;
+                width: 100%;
+
+                /* Put it at the bottom of the stack so it doesn't interfere with UI */
+                z-index: -1000;
+            }
+
+            #cappuccino-body .container {
+                display: table;
+                margin: 0 auto;
+                height: 100%;
+            }
+
+            #cappuccino-body .content {
+                display: table-cell;
+                height: 100%;
+                vertical-align: top;
+            }
+
+            #loading {
+                position: relative;
+                top: 35%;
+            }
+
+            #loading-text {
+                height: 1.5em;
+                color: #555;
+                font: normal bold 36px/36px Arial, sans-serif;
+            }
+
+            #progress-indicator {
+                padding: 0px;
+                height: 16px;
+                border: 5px solid #555;
+                border-radius: 18px;
+                background-color: white;
+            }
+
+            #progress-bar {
+                position: relative;
+                top: -1px;
+                left: -1px;
+                display: block;
+                height: 18px;
+
+                /* Compensate for moving the bar left 1px to overlap the indicator border */
+                border-right: 1px solid #555;
+                background-color: #555;
+            }
+
+            #noscript {
+                position: relative;
+                top: 35%;
+                padding: 1em 1.5em;
+                border: 5px solid #555;
+                border-radius: 16px;
+                background-color: white;
+                color: #555;
+                text-align: center;
+                font: bold 24px Arial, sans-serif;
+            }
+
+            #noscript a {
+                color: #98c0ff;
+                text-decoration: none;
+            }
+        </style>
+    </head>
+
+    <body>
+        <div id="cappuccino-body">
+            <div class="container">
+                <div class="content">
+                    <script type="text/javascript">
+                        document.write(loadingHTML);
+                    </script>
+                </div>
+            </div>
+            <noscript style="position:absolute; top:0; left:0; width:100%; height:100%">
+                <div class="container">
+                    <div class="content">
+                        <div id="noscript">
+                            <p style="font-size:120%; margin-bottom:.75em">JavaScript is required for this site.</p>
+                            <p><a href="http://www.enable-javascript.com" target="_blank">Enable JavaScript</a></p>
+                        </div>
+                    </div>
+                </div>
+            </noscript>
+        </div>
+    </body>
+</html>

Tests/Manual/CPTextViewCibTest/index.html

@@ -0,0 +1,161 @@
+<!DOCTYPE html>
+<html lang="en">
+<!--
+ index.html
+ CPTextViewCibTest
+
+ Created by You on June 4, 2014.
+ Copyright 2014, Your Company All rights reserved.
+-->
+    <head>
+        <meta charset="utf-8">
+
+        <!--[if lte IE 8]>
+        <meta http-equiv="X-UA-Compatible" content="IE=EmulateIE7, chrome=1">
+        <![endif]-->
+        <!--[if gte IE 9]>
+        <meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1">
+        <![endif]-->
+
+        <meta name="viewport" content="initial-scale=1.0, user-scalable=no">
+
+        <meta name="apple-mobile-web-app-capable" content="yes">
+        <meta name="apple-mobile-web-app-status-bar-style" content="black">
+
+        <link rel="apple-touch-icon" href="Resources/icon.png">
+        <link rel="apple-touch-startup-image" href="Resources/default.png">
+
+        <title>CPTextViewCibTest</title>
+
+        <!-- Custom javascript goes here -->
+        <!-- End custom javascript -->
+
+        <script type="text/javascript">
+            OBJJ_MAIN_FILE = "main.j";
+
+            var progressBar = null;
+
+            OBJJ_PROGRESS_CALLBACK = function(percent, appSize, path)
+            {
+                percent = percent * 100;
+
+                if (!progressBar)
+                    progressBar = document.getElementById("progress-bar");
+
+                if (progressBar)
+                    progressBar.style.width = Math.min(percent, 100) + "%";
+            }
+
+            var loadingHTML =
+                    '<div id="loading">' +
+                    '    <div id="loading-text">Loading...</div>' +
+                    '    <div id="progress-indicator">' +
+                    '        <span id="progress-bar" style="width:0%"></span>' +
+                    '    </div>' +
+                    '</div>';
+        </script>
+
+        <script type="text/javascript" src="Frameworks/Objective-J/Objective-J.js" charset="UTF-8"></script>
+
+        <style type="text/css">
+            html, body, h1, p {
+                margin: 0;
+                padding: 0;
+            }
+
+            /* We need a body wrapper because Cappuccino is unhappy if we change the body element */
+            #cappuccino-body {
+                /* Position it absolutely so it will fill the height without content */
+                position: absolute;
+                top: 0;
+                bottom: 0;
+                width: 100%;
+
+                /* Put it at the bottom of the stack so it doesn't interfere with UI */
+                z-index: -1000;
+            }
+
+            #cappuccino-body .container {
+                display: table;
+                margin: 0 auto;
+                height: 100%;
+            }
+
+            #cappuccino-body .content {
+                display: table-cell;
+                height: 100%;
+                vertical-align: top;
+            }
+
+            #loading {
+                position: relative;
+                top: 35%;
+            }
+
+            #loading-text {
+                height: 1.5em;
+                color: #555;
+                font: normal bold 36px/36px Arial, sans-serif;
+            }
+
+            #progress-indicator {
+                padding: 0px;
+                height: 16px;
+                border: 5px solid #555;
+                border-radius: 18px;
+                background-color: white;
+            }
+
+            #progress-bar {
+                position: relative;
+                top: -1px;
+                left: -1px;
+                display: block;
+                height: 18px;
+
+                /* Compensate for moving the bar left 1px to overlap the indicator border */
+                border-right: 1px solid #555;
+                background-color: #555;
+            }
+
+            #noscript {
+                position: relative;
+                top: 35%;
+                padding: 1em 1.5em;
+                border: 5px solid #555;
+                border-radius: 16px;
+                background-color: white;
+                color: #555;
+                text-align: center;
+                font: bold 24px Arial, sans-serif;
+            }
+
+            #noscript a {
+                color: #98c0ff;
+                text-decoration: none;
+            }
+        </style>
+    </head>
+
+    <body>
+        <div id="cappuccino-body">
+            <div class="container">
+                <div class="content">
+                    <script type="text/javascript">
+                        document.write(loadingHTML);
+                    </script>
+                </div>
+            </div>
+            <noscript style="position:absolute; top:0; left:0; width:100%; height:100%">
+                <div class="container">
+                    <div class="content">
+                        <div id="noscript">
+                            <p style="font-size:120%; margin-bottom:.75em">JavaScript is required for this site.</p>
+                            <p><a href="http://www.enable-javascript.com" target="_blank">Enable JavaScript</a></p>
+                        </div>
+                    </div>
+                </div>
+            </noscript>
+        </div>
+    </body>
+</html>

Tests/Manual/CPTextViewCibTest/main.j

@@ -0,0 +1,18 @@
+/*
+ * AppController.j
+ * CPTextViewCibTest
+ *
+ * Created by You on June 4, 2014.
+ * Copyright 2014, Your Company All rights reserved.
+ */
+
+@import <Foundation/Foundation.j>
+@import <AppKit/AppKit.j>
+
+@import "AppController.j"
+
+
+function main(args, namedArgs)
+{
+    CPApplicationMain(args, namedArgs);
+}

Tools/XcodeCapp/XcodeCapp.xcodeproj/project.pbxproj

@@ -31,8 +31,6 @@
 		6841F2461AF98CE600CFE60E /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 6841F2451AF98CE600CFE60E /* Images.xcassets */; };
 		6841F26C1AF98DDD00CFE60E /* mod_pbxproj.py in Resources */ = {isa = PBXBuildFile; fileRef = 6841F2691AF98DDD00CFE60E /* mod_pbxproj.py */; };
 		6841F26E1AF98DDD00CFE60E /* pbxprojModifier.py in Resources */ = {isa = PBXBuildFile; fileRef = 6841F26B1AF98DDD00CFE60E /* pbxprojModifier.py */; };
-		6841F27C1AF990C300CFE60E /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 6841F27A1AF990C300CFE60E /* Debug.xcconfig */; };
-		6841F27D1AF990C300CFE60E /* Release.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 6841F27B1AF990C300CFE60E /* Release.xcconfig */; };
 		6841F2A51AF9932300CFE60E /* project.pbxproj in Resources */ = {isa = PBXBuildFile; fileRef = 6841F28A1AF9932300CFE60E /* project.pbxproj */; };
 		6841F2B71AFA83D500CFE60E /* XCCUserDefaults.m in Sources */ = {isa = PBXBuildFile; fileRef = 6841F2B61AFA83D500CFE60E /* XCCUserDefaults.m */; };
 		6841F2BF1AFA965300CFE60E /* XCCTaskLauncher.m in Sources */ = {isa = PBXBuildFile; fileRef = 6841F2BE1AFA965300CFE60E /* XCCTaskLauncher.m */; };
@@ -324,7 +322,7 @@
 		6841F2331AF98CE600CFE60E /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
-				LastUpgradeCheck = 0630;
+				LastUpgradeCheck = 0800;
 				ORGANIZATIONNAME = "cappuccino-project";
 				TargetAttributes = {
 					6841F23A1AF98CE600CFE60E = {
@@ -364,10 +362,8 @@
 				021B94671B20D1F800F12DDA /* OperationsView.xib in Resources */,
 				021B94711B20E31F00F12DDA /* SettingsView.xib in Resources */,
 				0258004B1B1E67090000EB7D /* supawhich in Resources */,
-				6841F27C1AF990C300CFE60E /* Debug.xcconfig in Resources */,
 				6841F26E1AF98DDD00CFE60E /* pbxprojModifier.py in Resources */,
 				6841F2A51AF9932300CFE60E /* project.pbxproj in Resources */,
-				6841F27D1AF990C300CFE60E /* Release.xcconfig in Resources */,
 				0257A65B1B3A2B0000015C1F /* MainMenu.xib in Resources */,
 				6841F26C1AF98DDD00CFE60E /* mod_pbxproj.py in Resources */,
 				021B94691B20D6FC00F12DDA /* ErrorsView.xib in Resources */,
@@ -437,8 +433,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "-";
@@ -447,6 +445,7 @@
 				DEPLOYMENT_LOCATION = YES;
 				DSTROOT = /;
 				ENABLE_STRICT_OBJC_MSGSEND = YES;
+				ENABLE_TESTABILITY = YES;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
 				GCC_NO_COMMON_BLOCKS = YES;
@@ -462,7 +461,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
@@ -483,8 +482,10 @@
 				CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
 				CLANG_WARN_EMPTY_BODY = YES;
 				CLANG_WARN_ENUM_CONVERSION = YES;
+				CLANG_WARN_INFINITE_RECURSION = YES;
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
+				CLANG_WARN_SUSPICIOUS_MOVE = YES;
 				CLANG_WARN_UNREACHABLE_CODE = YES;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
 				CODE_SIGN_IDENTITY = "-";
@@ -502,7 +503,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				MACOSX_DEPLOYMENT_TARGET = 10.8;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 			};
@@ -518,6 +519,7 @@
 				INFOPLIST_FILE = XcodeCapp/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				PRODUCT_BUNDLE_IDENTIFIER = org.cappuccino.xcodecapp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Debug;
@@ -532,6 +534,7 @@
 				INFOPLIST_FILE = XcodeCapp/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/../Frameworks";
 				MACOSX_DEPLOYMENT_TARGET = 10.7;
+				PRODUCT_BUNDLE_IDENTIFIER = org.cappuccino.xcodecapp;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 			};
 			name = Release;

Tools/XcodeCapp/XcodeCapp/AppDelegate.h

@@ -32,4 +32,4 @@
 - (IBAction)openAbout:(id)aSender;
 - (IBAction)openPreferences:(id)aSender;
 
-@end
+@end

Tools/XcodeCapp/XcodeCapp/XCCCappuccinoProjectController.m

@@ -43,7 +43,7 @@ void fsevents_callback(ConstFSEventStreamRef streamRef, void *userData, size_t n
 {
     XCCCappuccinoProjectController *controller = (__bridge  XCCCappuccinoProjectController *)userData;
     NSArray *paths = (__bridge  NSArray *)eventPaths;
-    
+
     [controller _handleFSEventsWithPaths:paths flags:eventFlags ids:eventIds];
 }
 
@@ -64,11 +64,11 @@ void fsevents_callback(ConstFSEventStreamRef streamRef, void *userData, size_t n
         self.cappuccinoProject              = [[XCCCappuccinoProject alloc] initWithPath:aPath];
         self.mainXcodeCappController        = aController;
         self->sourceProcessingOperations    = [@{} mutableCopy];
-        self->operationQueue                = [[NSApp delegate] mainOperationQueue];
-        
+        self->operationQueue                = [((AppDelegate *)[NSApp delegate]) mainOperationQueue];
+
         [self _reinitializeProjectController];
     }
-    
+
     return self;
 }
 
@@ -83,16 +83,16 @@ void fsevents_callback(ConstFSEventStreamRef streamRef, void *userData, size_t n
 - (void)_reinitializeTaskLauncher
 {
     NSArray *binaryPaths = @[];
-    
+
     if ([self.cappuccinoProject.binaryPaths count])
         binaryPaths = [self.cappuccinoProject.binaryPaths valueForKeyPath:@"name"];
-    
+
     self->taskLauncher = [[XCCTaskLauncher alloc] initWithEnvironmentPaths:binaryPaths];
-    
+
     if (!self->taskLauncher.isValid)
     {
         [[NSApplication sharedApplication] activateIgnoringOtherApps:YES];
-        
+
         NSRunAlertPanel(
                         self.cappuccinoProject.nickname,
                         @"XcodeCapp was unable to find all necessary executables in your environment:\n\n"
@@ -102,7 +102,7 @@ void fsevents_callback(ConstFSEventStreamRef streamRef, void *userData, size_t n
                         nil,
                         nil,
                         [self->taskLauncher.executables componentsJoinedByString:@", "]);
-        
+
         [self _reinitializeProjectController];
     }
 }
@@ -183,7 +183,7 @@ void fsevents_callback(ConstFSEventStreamRef streamRef, void *userData, size_t n
 
     BOOL projectExists, projectIsDirectory;
     projectExists = [fm fileExistsAtPath:self.cappuccinoProject.XcodeProjectPath isDirectory:&projectIsDirectory];
-    
+
     BOOL supportExists, supportIsDirectory;
     supportExists = [fm fileExistsAtPath:self.cappuccinoProject.supportPath isDirectory:&supportIsDirectory];
 
@@ -197,43 +197,43 @@ void fsevents_callback(ConstFSEventStreamRef streamRef, void *userData, size_t n
 - (BOOL)_isXcodeSupportCompatible
 {
     double appCompatibilityVersion = [[[NSBundle mainBundle] objectForInfoDictionaryKey:XCCCompatibilityVersionKey] doubleValue];
-    
+
     NSNumber *projectCompatibilityVersion = @([self.cappuccinoProject.version intValue]);
-    
+
     if (projectCompatibilityVersion == nil)
     {
         NSLog(@"No compatibility version in project");
         return NO;
     }
-    
+
     NSLog(@"XcodeCapp/project compatibility version: %0.1f/%0.1f", projectCompatibilityVersion.doubleValue, appCompatibilityVersion);
-    
+
     return projectCompatibilityVersion.doubleValue >= appCompatibilityVersion;
 }
 
 - (void)_createXcodeProject
 {
     [self _removeXcodeProject];
-    
+
     NSFileManager *fm = [NSFileManager defaultManager];
-    
+
     [fm createDirectoryAtPath:self.cappuccinoProject.XcodeProjectPath withIntermediateDirectories:YES attributes:nil error:nil];
-    
+
     NSString *pbxPath = [self.cappuccinoProject.XcodeProjectPath stringByAppendingPathComponent:@"project.pbxproj"];
-    
+
     [fm copyItemAtPath:[[NSBundle mainBundle] pathForResource:@"project" ofType:@"pbxproj"] toPath:pbxPath error:nil];
-    
+
     NSMutableString *content = [NSMutableString stringWithContentsOfFile:pbxPath encoding:NSUTF8StringEncoding error:nil];
-    
+
     [content writeToFile:pbxPath atomically:YES encoding:NSUTF8StringEncoding error:nil];
-    
+
     NSLog(@"Xcode support project created at: %@", self.cappuccinoProject.XcodeProjectPath);
 }
 
 - (void)_removeXcodeProject
 {
     NSFileManager *fm = [NSFileManager defaultManager];
-    
+
     if ([fm fileExistsAtPath:self.cappuccinoProject.XcodeProjectPath])
         [fm removeItemAtPath:self.cappuccinoProject.XcodeProjectPath error:nil];
 }
@@ -241,20 +241,20 @@ void fsevents_callback(ConstFSEventStreamRef streamRef, void *userData, size_t n
 - (void)_createXcodeSupportDirectory
 {
     [self _removeXcodeSupportDirectory];
-    
+
     [[NSFileManager defaultManager] createDirectoryAtPath:self.cappuccinoProject.supportPath withIntermediateDirectories:YES attributes:nil error:nil];
-    
+
     [self.cappuccinoProject saveSettings];
-    
+
     NSLog(@".XcodeSupport directory created at: %@", self.cappuccinoProject.supportPath);
 }
 
 - (void)_removeXcodeSupportDirectory
 {
     [XcodeProjectCloser closeXcodeProjectForProject:self.cappuccinoProject.projectPath];
-    
+
     NSFileManager *fm = [NSFileManager defaultManager];
-    
+
     if ([fm fileExistsAtPath:self.cappuccinoProject.supportPath])
         [fm removeItemAtPath:self.cappuccinoProject.supportPath error:nil];
 }
@@ -272,13 +272,13 @@ void fsevents_callback(ConstFSEventStreamRef streamRef, void *userData, size_t n
     NSArray         *subpaths       = [[NSFileManager defaultManager] contentsOfDirectoryAtPath:self.cappuccinoProject.supportPath error:nil];
     NSMutableArray  *orphanFiles    = [@[] mutableCopy];
     NSFileManager   *fm             = [NSFileManager defaultManager];
-    
+
     for (NSString *path in subpaths)
     {
         if ([XCCCappuccinoProject isHeaderFile:path] && ![path.lastPathComponent isEqualToString:@"xcc_general_include.h"])
         {
             NSString *sourcePath = [self.cappuccinoProject sourcePathForShadowPath:path];
-            
+
             if (![fm fileExistsAtPath:sourcePath])
                 [orphanFiles addObject:sourcePath];
         }
@@ -291,15 +291,15 @@ void fsevents_callback(ConstFSEventStreamRef streamRef, void *userData, size_t n
         NSString *shadowBasePath            = [self.cappuccinoProject shadowBasePathForProjectSourcePath:sourcePath];
         NSString *shadowHeaderPath          = [shadowBasePath stringByAppendingPathExtension:@"h"];
         NSString *shadowImplementationPath  = [shadowBasePath stringByAppendingPathExtension:@"m"];
-        
+
         [fm removeItemAtPath:shadowHeaderPath error:nil];
         [fm removeItemAtPath:shadowImplementationPath error:nil];
-        
+
         [self removeOperationErrorsRelatedToSourcePath:sourcePath errorType:XCCDefaultOperationErrorType];
 
         [pathsToRemove addObject:sourcePath];
     }
-    
+
     [self.mainXcodeCappController.errorsViewController reload];
 
     if (self->pendingPBXOperation)
@@ -329,14 +329,14 @@ void fsevents_callback(ConstFSEventStreamRef streamRef, void *userData, size_t n
 - (void)_updateXcodeSupportFilesWithRenamedDirectories:(NSArray *)directories
 {
     NSLog(@"Renamed directories: %@", directories);
-    
+
     NSFileManager *fm = [NSFileManager defaultManager];
-    
+
     for (NSString *directory in directories)
     {
         if ([directory isEqualToString:self.cappuccinoProject.projectPath])
             continue;
-        
+
         if ([fm fileExistsAtPath:directory])
         {
             if ([directory hasPrefix:self.cappuccinoProject.projectPath])
@@ -549,7 +549,7 @@ void fsevents_callback(ConstFSEventStreamRef streamRef, void *userData, size_t n
 {
     if (![self _doesNotificationBelongToCurrentProject:note])
         return;
-    
+
     [self operationDidEnd:note.object type:note.name userInfo:note.userInfo];
 }
 
@@ -560,17 +560,17 @@ void fsevents_callback(ConstFSEventStreamRef streamRef, void *userData, size_t n
 {
     if (!operationError.fileName)
         operationError.fileName = @"/No Filename";
-    
+
     [self willChangeValueForKey:@"errors"];
-    
+
     if (!self.errors[operationError.fileName])
         self.errors[operationError.fileName] = [@[] mutableCopy];
-    
+
     [self.errors[operationError.fileName] addObject:operationError];
-    
+
     [self didChangeValueForKey:@"errors"];
     self.numberOfErrors++;
-    
+
     [self _notifyUserWithOperationError:operationError];
 }
 
@@ -578,14 +578,14 @@ void fsevents_callback(ConstFSEventStreamRef streamRef, void *userData, size_t n
 {
     if (!operationError.fileName)
         operationError.fileName = @"/No Filename";
-    
+
     [self willChangeValueForKey:@"errors"];
-    
+
     [self.errors[operationError.fileName] removeObject:operationError];
-    
+
     if (![self.errors[operationError.fileName] count])
         [self.errors removeObjectForKey:operationError.fileName];
-    
+
     [self didChangeValueForKey:@"errors"];
     self.numberOfErrors--;
 }
@@ -601,11 +601,11 @@ void fsevents_callback(ConstFSEventStreamRef streamRef, void *userData, size_t n
 - (void)removeOperationErrorsRelatedToSourcePath:(NSString *)aPath errorType:(int)anErrorType
 {
     NSMutableArray *errorsToRemove = [@[] mutableCopy];
-    
+
     for (XCCOperationError *operationError in self.errors[aPath])
         if ([operationError.fileName isEqualToString:aPath] && (operationError.errorType == anErrorType || anErrorType == XCCDefaultOperationErrorType))
             [errorsToRemove addObject:operationError];
-    
+
     for (XCCOperationError *error in errorsToRemove)
         [self removeOperationError:error];
 }
@@ -619,11 +619,11 @@ void fsevents_callback(ConstFSEventStreamRef streamRef, void *userData, size_t n
 {
     if (numberOfErrors == _numberOfErrors)
         return;
-    
+
     [self willChangeValueForKey:@"numberOfErrors"];
     _numberOfErrors = numberOfErrors;
     [self didChangeValueForKey:@"numberOfErrors"];
-    
+
     if (!_numberOfErrors)
         self.errorsCountString = @"";
     else
@@ -882,9 +882,9 @@ void fsevents_callback(ConstFSEventStreamRef streamRef, void *userData, size_t n
     NSMutableArray *modifiedPaths       = [@[] mutableCopy];
     NSMutableArray *renamedDirectories  = [@[] mutableCopy];
     NSFileManager  *fm                  = [NSFileManager defaultManager];
-    
+
     BOOL needUpdate = NO;
-    
+
     for (size_t i = 0; i < paths.count; ++i)
     {
         FSEventStreamEventFlags flags       = eventFlags[i];
@@ -896,27 +896,27 @@ void fsevents_callback(ConstFSEventStreamRef streamRef, void *userData, size_t n
         if (rootChanged || needRescan)
         {
             NSLog(@"Watched path changed: %@", path);
-            
+
             [self _handleProjectPathChange:path];
             return;
         }
 
         BOOL isHistoryDoneSentinalEvent = (flags & kFSEventStreamEventFlagHistoryDone) != 0;
-        
+
         if (isHistoryDoneSentinalEvent)
         {
             NSLog(@"History done sentinal event");
             continue;
         }
-        
+
         BOOL isMountEvent = (flags & kFSEventStreamEventFlagMount) || (flags & kFSEventStreamEventFlagUnmount);
-        
+
         if (isMountEvent)
         {
             NSLog(@"Volume %@: %@", (flags & kFSEventStreamEventFlagMount) ? @"mounted" : @"unmounted", path);
             continue;
         }
-        
+
 
         BOOL inodeMetaModified  = (flags & kFSEventStreamEventFlagItemInodeMetaMod) != 0;
         BOOL isFile             = (flags & kFSEventStreamEventFlagItemIsFile)       != 0;
@@ -926,21 +926,21 @@ void fsevents_callback(ConstFSEventStreamRef streamRef, void *userData, size_t n
         BOOL modified           = (flags & kFSEventStreamEventFlagItemModified)     != 0;
         BOOL created            = (flags & kFSEventStreamEventFlagItemCreated)      != 0;
         BOOL removed            = (flags & kFSEventStreamEventFlagItemRemoved)      != 0;
-        
+
         if (isDir)
         {
             if (created && [path isEqualToString:self.cappuccinoProject.projectPath.stringByResolvingSymlinksInPath])
                 return;
-            
+
             if ((renamed || created || removed) &&
                 ![XCCCappuccinoProject shouldIgnoreDirectoryNamed:path.lastPathComponent] &&
                 ![XCCCappuccinoProject pathMatchesIgnoredPaths:path cappuccinoProjectIgnoredPathPredicates:self.cappuccinoProject.ignoredPathPredicates])
             {
                 NSLog(@"Renamed directory: %@", path);
-                
+
                 [renamedDirectories addObject:path];
             }
-            
+
             continue;
         }
         else if ((isFile || isSymlink) &&
@@ -957,27 +957,27 @@ void fsevents_callback(ConstFSEventStreamRef streamRef, void *userData, size_t n
             {
                 // If a xib is deleted, delete its cib. There is no need to update when a xib is deleted,
                 // it is inside a folder in Xcode, which updates automatically.
-                
+
                 if (![fm fileExistsAtPath:path])
                 {
                     NSString *cibPath = [path.stringByDeletingPathExtension stringByAppendingPathExtension:@"cib"];
-                    
+
                     if ([fm fileExistsAtPath:cibPath])
                         [fm removeItemAtPath:cibPath error:nil];
-                    
+
                     continue;
                 }
             }
-            
+
             needUpdate = YES;
         }
         else if ((isFile || isSymlink) && (renamed || removed) && !(modified || created) && [XCCCappuccinoProject isCibFile:path])
         {
             NSLog(@"FSEvent accepted: %@ (%@)", path, [XCCFSEventLogUtils dumpFSEventFlags:flags]);
-            
+
             // If a cib is deleted, mark its xib as needing update so the cib is regenerated
             NSString *xibPath = [path.stringByDeletingPathExtension stringByAppendingPathExtension:@"xib"];
-            
+
             if ([fm fileExistsAtPath:xibPath])
             {
                 [modifiedPaths addObject:xibPath];
@@ -993,7 +993,7 @@ void fsevents_callback(ConstFSEventStreamRef streamRef, void *userData, size_t n
             [self.cappuccinoProject reloadXcodeCappIgnoreFile];
         }
     }
-    
+
     // If directories were renamed, we take the easy way out and reset the project
     if (renamedDirectories.count)
         [self _updateXcodeSupportFilesWithRenamedDirectories:renamedDirectories];
@@ -1015,9 +1015,9 @@ void fsevents_callback(ConstFSEventStreamRef streamRef, void *userData, size_t n
 {
     NSWorkspace *workspace = [NSWorkspace sharedWorkspace];
     NSString *app, *type;
-    
+
     BOOL success = [workspace getInfoForFile:filePath application:&app type:&type];
-    
+
     return success ? app : nil;
 }
 
@@ -1032,14 +1032,14 @@ void fsevents_callback(ConstFSEventStreamRef streamRef, void *userData, size_t n
 {
     if (!applicationIdentifier)
         return;
-    
+
     NSFileManager       *fm             = [NSFileManager defaultManager];
     NSWorkspace         *workspace      = [NSWorkspace sharedWorkspace];
     NSBundle            *bundle         = [NSBundle bundleWithPath:applicationIdentifier];
     NSString            *identifier     = bundle.bundleIdentifier;
     NSString            *executablePath = nil;
     XCCLineSpecifier    lineSpecifier   = kLineSpecifierNone;
-    
+
     if ([identifier hasPrefix:@"com.sublimetext."])
     {
         lineSpecifier = kLineSpecifierColon;
@@ -1086,34 +1086,34 @@ void fsevents_callback(ConstFSEventStreamRef streamRef, void *userData, size_t n
     {
         executablePath = [[bundle bundlePath] stringByAppendingPathComponent:@"Contents/Developer/usr/bin/xed"];
     }
-    
+
     if (!executablePath || ![fm isExecutableFileAtPath:executablePath])
     {
         [workspace openFile:path];
         return;
     }
-    
+
     NSArray *args;
-    
+
     switch (lineSpecifier)
     {
         case kLineSpecifierNone:
             args = @[path];
             break;
-            
+
         case kLineSpecifierColon:
             args = @[[NSString stringWithFormat:@"%1$@:%2$ld", path, line]];
             break;
-            
+
         case kLineSpecifierMinusL:
             args = @[@"-l", [NSString stringWithFormat:@"%ld", line], path];
             break;
-            
+
         case kLineSpecifierPlus:
             args = @[[NSString stringWithFormat:@"+%ld", line], path];
             break;
     }
-    
+
     [self->taskLauncher runTaskWithCommand:executablePath arguments:args returnType:kTaskReturnTypeNone];
 }
 
@@ -1128,7 +1128,7 @@ void fsevents_callback(ConstFSEventStreamRef streamRef, void *userData, size_t n
     note.actionButtonTitle = @"Show";
     note.otherButtonTitle = @"Close";
     note.userInfo = @{@"cappuccinoProjectPath" : self.cappuccinoProject.projectPath, @"sourcePath": anOperationError.fileName};
-        
+
     [[NSUserNotificationCenter defaultUserNotificationCenter] deliverNotification:note];
 }
 
@@ -1138,7 +1138,7 @@ void fsevents_callback(ConstFSEventStreamRef streamRef, void *userData, size_t n
 - (void)reinitializeProjectFromSettings
 {
     NSLog(@"Saving Cappuccino configuration project %@", self.cappuccinoProject.projectPath);
-    
+
     [self _cancelAllProjectRelatedOperations];
     [self.cappuccinoProject saveSettings];
 
@@ -1196,26 +1196,26 @@ void fsevents_callback(ConstFSEventStreamRef streamRef, void *userData, size_t n
     BOOL            isOpened    = YES;
     NSFileManager   *fm         = [NSFileManager defaultManager];
     BOOL            exists      = [fm fileExistsAtPath:self.cappuccinoProject.XcodeProjectPath isDirectory:&isDirectory];
-    
+
     if (exists && isDirectory)
     {
         NSLog(@"Opening Xcode project at: %@", self.cappuccinoProject.XcodeProjectPath);
-        
+
         isOpened = [[NSWorkspace sharedWorkspace] openFile:self.cappuccinoProject.XcodeProjectPath];
     }
-    
+
     if (!exists || !isDirectory || !isOpened)
     {
         NSString *text;
-        
+
         if (!isOpened)
             text = @"The project exists, but failed to open.";
         else
             text = [NSString stringWithFormat:@"%@ %@.", self.cappuccinoProject.XcodeProjectPath, !exists ? @"does not exist" : @"is not an Xcode project"];
-        
+
         [[NSApplication sharedApplication] activateIgnoringOtherApps:YES];
         NSInteger response = NSRunAlertPanel(@"The project could not be opened.", @"%@\n\nWould you like to regenerate the project?", @"Yes", @"No", nil, text);
-        
+
         if (response == NSAlertFirstButtonReturn)
             [self resetProject:self];
     }
@@ -1231,7 +1231,7 @@ void fsevents_callback(ConstFSEventStreamRef streamRef, void *userData, size_t n
     NSFileManager   *fm         = [NSFileManager defaultManager];
     NSArray         *contents   = [fm contentsOfDirectoryAtPath:self.cappuccinoProject.projectPath error:nil];
     NSString        *firstObjjFile;
-    
+
     for (NSString *file in contents)
     {
         if ([[file pathExtension] isEqualToString:@"j"])
@@ -1240,15 +1240,15 @@ void fsevents_callback(ConstFSEventStreamRef streamRef, void *userData, size_t n
             break;
         }
     }
-    
+
     if (!firstObjjFile)
         return;
-    
+
     NSString *applicationIdentifier = [self _managingApplicationIdenfierForFilePath:[self.cappuccinoProject.projectPath stringByAppendingPathComponent:firstObjjFile]];
-    
+
     if (!applicationIdentifier)
         return;
-    
+
     [self launchEditorForPath:self.cappuccinoProject.projectPath line:0 applicationIdentifier:applicationIdentifier];
 }
 
@@ -1268,5 +1268,3 @@ void fsevents_callback(ConstFSEventStreamRef streamRef, void *userData, size_t n
 }
 
 @end
-
-

Tools/nib2cib/NSAppKit.j

@@ -45,6 +45,7 @@
 @import "NSImage.j"
 @import "NSImageView.j"
 @import "NSLayoutConstraint.j"
+@import "NSLayoutManager.j"
 @import "NSLevelIndicator.j"
 @import "NSLocalizableString.j"
 @import "NSMatrix.j"
@@ -54,6 +55,7 @@
 @import "NSNibConnector.j"
 @import "NSObjectController.j"
 @import "NSOutlineView.j"
+@import "NSParagraphStyle.j"
 @import "NSPopUpButton.j"
 @import "NSPredicateEditor.j"
 @import "NSResponder.j"
@@ -73,7 +75,12 @@
 @import "NSTableView.j"
 @import "NSTabView.j"
 @import "NSTabViewItem.j"
+@import "NSText.j"
+@import "NSTextContainer.j"
 @import "NSTextField.j"
+@import "NSTextStorage.j"
+@import "NSTextView.j"
+@import "NSTextViewSharedData.j"
 @import "NSTokenField.j"
 @import "NSToolbar.j"
 @import "NSToolbarFlexibleSpaceItem.j"
@@ -92,7 +99,6 @@
 @import "NSAppearance.j"
 @import "NSVisualEffectView.j"
 
-
 function CP_NSMapClassName(aClassName)
 {
     if (aClassName.indexOf("NS") === 0)

Tools/nib2cib/NSAttributedString.j

@@ -40,5 +40,7 @@
 
 @implementation NSMutableAttributedString : NSAttributedString
 {
+
 }
+
 @end

Tools/nib2cib/NSLayoutManager.j

@@ -0,0 +1,63 @@
+/*
+ * NSText.j
+ * nib2cib
+ *
+ * Created by Alexendre Wilhelm.
+ * Copyright 2014 The Cappuccino Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <AppKit/CPLayoutManager.j>
+
+@class Nib2Cib
+
+@implementation CPLayoutManager (NSCoding)
+
+- (id)NS_initWithCoder:(CPCoder)aCoder
+{
+    self = [super init];
+
+    _textStorage = [aCoder decodeObjectForKey:@"NSTextStorage"];
+    [_textStorage addLayoutManager:self];
+
+    return self;
+}
+
+@end
+
+@implementation NSLayoutManager : CPLayoutManager
+{
+
+}
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [self NS_initWithCoder:aCoder];
+
+    if (self)
+    {
+
+    }
+
+    return self;
+}
+
+- (Class)classForKeyedArchiver
+{
+    return [CPLayoutManager class];
+}
+
+@end

Tools/nib2cib/NSParagraphStyle.j

@@ -0,0 +1,66 @@
+/*
+ * NSParagraphStyle.j
+ * nib2cib
+ *
+ * Created by Alexendre Wilhelm.
+ * Copyright 2014 The Cappuccino Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <AppKit/CPParagraphStyle.j>
+
+@class Nib2Cib
+
+@implementation CPParagraphStyle (NSCoding)
+
+- (id)NS_initWithCoder:(CPCoder)aCoder
+{
+    self = [super init];
+
+    return self;
+}
+
+@end
+
+@implementation NSParagraphStyle : CPParagraphStyle
+{
+}
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [self NS_initWithCoder:aCoder];
+
+    if (self)
+    {
+        _alignment = [aCoder decodeIntForKey:@"NSAlignment"];
+        _firstLineHeadIndent = [aCoder decodeIntForKey:@"NSFirstLineHeadIndent"];
+        _headIndent = [aCoder decodeIntForKey:@"NSHeadIndent"];
+        _lineSpacing = [aCoder decodeIntForKey:@"NSLineSpacing"];
+        _maximumLineHeight = [aCoder decodeIntForKey:@"NSMaxLineHeight"];
+        _minimumLineHeight = [aCoder decodeIntForKey:@"NSMinLineHeight"];
+        _paragraphSpacing = [aCoder decodeIntForKey:@"NSParagraphSpacing"];
+        _tailIndent = [aCoder decodeIntForKey:@"NSTailIndent"];
+    }
+
+    return self;
+}
+
+- (Class)classForKeyedArchiver
+{
+    return [CPParagraphStyle class];
+}
+
+@end

Tools/nib2cib/NSText.j

@@ -0,0 +1,61 @@
+/*
+ * NSText.j
+ * nib2cib
+ *
+ * Created by Alexendre Wilhelm.
+ * Copyright 2014 The Cappuccino Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <AppKit/CPText.j>
+
+@class Nib2Cib
+
+@implementation CPText (NSCoding)
+
+- (id)NS_initWithCoder:(CPCoder)aCoder
+{
+    if (self = [super NS_initWithCoder:aCoder])
+    {
+    }
+
+    return self;
+}
+
+@end
+
+@implementation NSText : CPText
+{
+
+}
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [self NS_initWithCoder:aCoder];
+
+    if (self)
+    {
+    }
+
+    return self;
+}
+
+- (Class)classForKeyedArchiver
+{
+    return [CPText class];
+}
+
+@end

Tools/nib2cib/NSTextContainer.j

@@ -0,0 +1,64 @@
+/*
+ * NSTextContainer.j
+ * nib2cib
+ *
+ * Created by Alexendre Wilhelm.
+ * Copyright 2014 The Cappuccino Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <AppKit/CPTextContainer.j>
+
+@class Nib2Cib
+
+@implementation CPTextContainer (NSCoding)
+
+- (id)NS_initWithCoder:(CPCoder)aCoder
+{
+    self = [super init];
+
+    _size = CGSizeMake([aCoder decodeIntForKey:@"NSWidth"], 1e7);
+
+    _layoutManager = [aCoder decodeObjectForKey:@"NSLayoutManager"];
+    [_layoutManager addTextContainer:self];
+
+    return self;
+}
+
+@end
+
+@implementation NSTextContainer : CPTextContainer
+{
+}
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [self NS_initWithCoder:aCoder];
+
+    if (self)
+    {
+
+    }
+
+    return self;
+}
+
+- (Class)classForKeyedArchiver
+{
+    return [CPTextContainer class];
+}
+
+@end

Tools/nib2cib/NSTextStorage.j

@@ -0,0 +1,74 @@
+/*
+ * NSTextStorage.j
+ * nib2cib
+ *
+ * Created by Alexendre Wilhelm.
+ * Copyright 2014 The Cappuccino Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <AppKit/CPTextStorage.j>
+
+@class Nib2Cib
+
+@global CPForegroundColorAttributeName
+
+@implementation CPTextStorage (NSCoding)
+
+- (id)NS_initWithCoder:(CPCoder)aCoder
+{
+    var xibAttributes = [aCoder decodeObjectForKey:@"NSAttributes"],
+        cibAttributes = @{};
+
+    if ([xibAttributes containsKey:@"NSColor"])
+        [cibAttributes setObject:[xibAttributes valueForKey:@"NSColor"] forKey:CPForegroundColorAttributeName];
+
+    if ([xibAttributes containsKey:@"NSFont"])
+        [cibAttributes setObject:[xibAttributes valueForKey:@"NSFont"] forKey:CPFontAttributeName];
+
+    if ([xibAttributes containsKey:@"NSParagraphStyle"])
+        [cibAttributes setObject:[xibAttributes valueForKey:@"NSParagraphStyle"] forKey:CPParagraphStyleAttributeName];
+
+    self = [super initWithString:[aCoder decodeObjectForKey:@"NSString"] attributes:cibAttributes];
+
+    return self;
+}
+
+@end
+
+@implementation NSTextStorage : CPTextStorage
+{
+
+}
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [self NS_initWithCoder:aCoder];
+
+    if (self)
+    {
+
+    }
+
+    return self;
+}
+
+- (Class)classForKeyedArchiver
+{
+    return [CPTextStorage class];
+}
+
+@end

Tools/nib2cib/NSTextView.j

@@ -0,0 +1,74 @@
+/*
+ * NSTextView.j
+ * nib2cib
+ *
+ * Created by Alexendre Wilhelm.
+ * Copyright 2014 The Cappuccino Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <AppKit/CPTextView.j>
+
+@import "NSTextViewSharedData.j"
+
+@class Nib2Cib
+
+@implementation CPTextView (NSCoding)
+
+- (id)NS_initWithCoder:(CPCoder)aCoder textViewSharedData:(CPTextViewSharedData)aTextViewSharedData
+{
+    if (self = [super NS_initWithCoder:aCoder])
+    {
+        _textContainer = [aCoder decodeObjectForKey:@"NSTextContainer"];
+
+        [self setEditable:[aTextViewSharedData isEditable]];
+        [self setSelectable:[aTextViewSharedData isSelectable]];
+        [self setRichText:[aTextViewSharedData isRichText]];
+        [self setAllowsUndo:[aTextViewSharedData allowsUndo]];
+        [self setUsesFontPanel:[aTextViewSharedData usesFontPanel]];
+
+        [self setBackgroundColor:[aTextViewSharedData backgroundColor]];
+        [self setInsertionPointColor:[aTextViewSharedData insertionColor]];
+        [self setSelectedTextAttributes:[aTextViewSharedData selectedTextAttributes]];
+        [[self textContainer] setWidthTracksTextView:YES];
+    }
+
+    return self;
+}
+
+@end
+
+@implementation NSTextView : CPTextView
+{
+
+}
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    if (self = [self NS_initWithCoder:aCoder textViewSharedData:[aCoder decodeObjectForKey:@"NSSharedData"]])
+    {
+
+    }
+
+    return self;
+}
+
+- (Class)classForKeyedArchiver
+{
+    return [CPTextView class];
+}
+
+@end

Tools/nib2cib/NSTextViewSharedData.j

@@ -0,0 +1,100 @@
+/*
+ * NSTextView.j
+ * nib2cib
+ *
+ * Created by Alexendre Wilhelm.
+ * Copyright 2014 The Cappuccino Foundation.
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+@import <Foundation/Foundation.j>
+@import <AppKit/CPColor.j>
+@import <AppKit/CPParagraphStyle.j>
+
+@class Nib2Cib
+
+@implementation CPTextViewSharedData : CPObject
+{
+    BOOL                _allowsUndo             @accessors(getter=allowsUndo);
+    BOOL                _editable               @accessors(getter=isEditable);
+    BOOL                _richText               @accessors(getter=isRichText);
+    BOOL                _selectable             @accessors(getter=isSelectable);
+    BOOL                _usesFontPanel          @accessors(getter=usesFontPanel);
+    CPColor             _backgroundColor        @accessors(getter=backgroundColor);
+    CPColor             _insertionColor         @accessors(getter=insertionColor);
+    CPDictionary        _selectedTextAttributes @accessors(getter=selectedTextAttributes);
+}
+
+- (id)init
+{
+    if (self = [super init])
+    {
+
+    }
+
+    return self;
+}
+
+@end
+
+
+@implementation CPTextViewSharedData (NSCoding)
+
+- (id)NS_initWithCoder:(CPCoder)aCoder
+{
+    if (self = [super init])
+    {
+        var flags = [aCoder decodeIntForKey:@"NSFlags"];
+
+        _allowsUndo = (flags & 0x0000400) ? YES : NO;
+        _editable = (flags & 0x00000002) ? YES : NO;
+        _richText = (flags & 0x00000004) ? YES : NO;
+        _selectable = (flags & 0x00000001) ? YES : NO;
+        _usesFontPanel = (flags & 0x00000020) ? YES : NO;
+
+        _backgroundColor = [aCoder decodeObjectForKey:@"NSBackgroundColor"];
+        _insertionColor = [aCoder decodeObjectForKey:@"NSInsertionColor"];
+        _selectedTextAttributes = [aCoder decodeObjectForKey:@"NSSelectedAttributes"];
+    }
+
+    return self;
+}
+
+@end
+
+@implementation NSTextViewSharedData : CPTextViewSharedData
+{
+
+}
+
+- (id)initWithCoder:(CPCoder)aCoder
+{
+    self = [self NS_initWithCoder:aCoder];
+
+    if (self)
+    {
+
+    }
+
+    return self;
+}
+
+- (Class)classForKeyedArchiver
+{
+    return [CPTextViewSharedData class];
+}
+
+@end