This will be Cappuccino 0.9.10.

Removed an unused variable: cachedSearchResults.

AppKit/AppKit.j

@@ -27,6 +27,7 @@
 @import "CPAccordionView.j"
 @import "CPAlert.j"
 @import "CPAnimation.j"
+@import "CPAnimationContext.j"
 @import "CPAppearance.j"
 @import "CPApplication.j"
 @import "CPArrayController.j"
@@ -100,6 +101,7 @@
 @import "CPTabView.j"
 @import "CPText.j"
 @import "CPTextField.j"
+@import "CPTextView.j"
 @import "CPTokenField.j"
 @import "CPToolbar.j"
 @import "CPToolbarItem.j"
@@ -107,6 +109,7 @@
 @import "CPTreeNode.j"
 @import "CPUserDefaultsController.j"
 @import "CPView.j"
+@import "CPViewAnimator.j"
 @import "CPViewAnimation.j"
 @import "CPViewController.j"
 @import "CPVisualEffectView.j"

AppKit/CPBox.j

@@ -630,7 +630,11 @@ var CPBoxTypeKey          = @"CPBoxTypeKey",
             [_contentView setSubviews:[malformedContentView subviews]];
             [self replaceSubview:malformedContentView with:_contentView];
         }
-
+        else
+        {
+            _titlePosition = CPNoTitle;        
+        }
+        
         [self setAutoresizesSubviews:YES];
         [_contentView setAutoresizingMask:CPViewWidthSizable | CPViewHeightSizable];
 

AppKit/CPCollectionView.j

@@ -31,6 +31,7 @@
 @import "CPDragServer_Constants.j"
 @import "CPPasteboard.j"
 @import "CPView.j"
+@import "CPKeyValueBinding.j"
 
 @class _CPCollectionViewDropIndicator
 
@@ -132,7 +133,6 @@ var HORIZONTAL_MARGIN = 2;
     CGSize                          _storedFrameSize;
 
     BOOL                            _uniformSubviewsResizing @accessors(property=uniformSubviewsResizing);
-    BOOL                            _lockResizing;
 
     CPInteger                       _currentDropIndex;
     CPDragOperation                 _currentDragOperation;
@@ -140,6 +140,14 @@ var HORIZONTAL_MARGIN = 2;
     _CPCollectionViewDropIndicator  _dropView;
 }
 
++ (Class)_binderClassForBinding:(CPString)aBinding
+{
+    if (aBinding == CPContentBinding)
+        return [_CPCollectionViewContentBinder class];
+
+    return [super _binderClassForBinding:aBinding];
+}
+
 - (id)initWithFrame:(CGRect)aFrame
 {
     self = [super initWithFrame:aFrame];
@@ -182,7 +190,7 @@ var HORIZONTAL_MARGIN = 2;
 
     _needsMinMaxItemSizeUpdate = YES;
     _uniformSubviewsResizing = NO;
-    _lockResizing = NO;
+    _inLiveResize = NO;
 
     _currentDropIndex      = -1;
     _currentDragOperation  = CPDragOperationNone;
@@ -384,14 +392,7 @@ var HORIZONTAL_MARGIN = 2;
     _isSelectable = isSelectable;
 
     if (!_isSelectable)
-    {
-        var index = CPNotFound,
-            itemCount = [_items count];
-
-        // Be wary of invalid selection ranges since setContent: does not clear selection indexes.
-        while ((index = [_selectionIndexes indexGreaterThanIndex:index]) != CPNotFound && index < itemCount)
-            [_items[index] setSelected:NO];
-    }
+        [self _applySelectionToItems:NO];
 }
 
 /*!
@@ -445,22 +446,15 @@ var HORIZONTAL_MARGIN = 2;
 {
     if (!anIndexSet)
         anIndexSet = [CPIndexSet indexSet];
+
     if (!_isSelectable || [_selectionIndexes isEqual:anIndexSet])
         return;
 
-    var index = CPNotFound,
-        itemCount = [_items count];
-
-    // Be wary of invalid selection ranges since setContent: does not clear selection indexes.
-    while ((index = [_selectionIndexes indexGreaterThanIndex:index]) !== CPNotFound && index < itemCount)
-        [_items[index] setSelected:NO];
+    [self _applySelectionToItems:NO];
 
     _selectionIndexes = anIndexSet;
 
-    var index = CPNotFound;
-
-    while ((index = [_selectionIndexes indexGreaterThanIndex:index]) !== CPNotFound)
-        [_items[index] setSelected:YES];
+    [self _applySelectionToItems:YES];
 
     var binderClass = [[self class] _binderClassForBinding:@"selectionIndexes"];
     [[binderClass getBinding:@"selectionIndexes" forObject:self] reverseSetValueFor:@"selectionIndexes"];
@@ -525,14 +519,14 @@ var HORIZONTAL_MARGIN = 2;
 
 - (void)resizeWithOldSuperviewSize:(CGSize)oldBoundsSize
 {
-    if (_lockResizing)
+    if (_inLiveResize)
         return;
 
-    _lockResizing = YES;
+    _inLiveResize = YES;
 
     [self tile];
 
-    _lockResizing = NO;
+    _inLiveResize = NO;
 }
 
 - (void)tile
@@ -972,6 +966,20 @@ var HORIZONTAL_MARGIN = 2;
     return frame;
 }
 
+- (void)_applySelectionToItems:(BOOL)select
+{
+    var numberOfItems = [_items count];
+
+    [_selectionIndexes enumerateIndexesUsingBlock:function(idx, stop)
+    {
+        if (idx < numberOfItems)
+            [[_items objectAtIndex:idx] setSelected:select];
+        else {
+            stop(YES);
+        }
+    }];
+}
+
 @end
 
 @implementation CPCollectionView (DragAndDrop)
@@ -1586,3 +1594,14 @@ var CPCollectionViewMinItemSizeKey              = @"CPCollectionViewMinItemSizeK
 }
 
 @end
+
+@implementation _CPCollectionViewContentBinder : CPBinder
+{
+}
+
+- (void)setValue:(id)aValue forBinding:(CPString)aBinding
+{
+    [_source setContent:aValue];
+}
+
+@end

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/CPColorPicker.j

@@ -125,7 +125,8 @@
     _brightnessSlider = [[CPSlider alloc] initWithFrame:CGRectMake(0, (aFrame.size.height - 34), aFrame.size.width, 15)];
 
     [_brightnessSlider setValue:15.0 forThemeAttribute:@"track-width"];
-    [_brightnessSlider setValue:[CPColor colorWithPatternImage:[[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPColorPicker class]] pathForResource:@"brightness_bar.png"]]] forThemeAttribute:@"track-color"];
+    var brightnessImage = [[CPImage alloc] initWithContentsOfFile:[[CPBundle bundleForClass:[CPColorPicker class]] pathForResource:@"brightness_bar.png"] size:CGSizeMake(272, 20)];
+    [_brightnessSlider setValue:[CPColor colorWithPatternImage:brightnessImage] forThemeAttribute:@"track-color"];
 
     [_brightnessSlider setMinValue:0.0];
     [_brightnessSlider setMaxValue:100.0];

AppKit/CPColorWell.j

@@ -255,6 +255,8 @@ var _CPColorWellDidBecomeExclusiveNotification = @"_CPColorWellDidBecomeExclusiv
 
     var colorPanel = [CPColorPanel sharedColorPanel];
 
+    [colorPanel setPlatformWindow:[[self window] platformWindow]];
+
     [colorPanel setColor:_color];
     [colorPanel orderFront:self];
 }

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;
@@ -80,18 +81,27 @@ CPFileAPIFeature                        = 31;
 
 CPAltEnterTextAreaFeature               = 32;
 
-
+CPCSSAnimationFeature                   = 33;
 
 /*
     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,15 +120,15 @@ 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;
 }
 
 // Internet Explorer
-else if (typeof window !== "undefined" && window.attachEvent) // Must follow Opera check.
+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) // Must follow Ope
     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)
@@ -322,6 +335,14 @@ else
     CPRedoKeyEquivalentModifierMask = CPControlKeyMask;
 }
 
+/*!
+    Sets a feature with the given value.
+*/
+function CPSetPlatformFeature(aFeature, aBool)
+{
+    PLATFORM_FEATURES[aFeature] = aBool;
+}
+
 /*!
     Return the properly prefixed JS property for the given name. E.g. in a webkit browser,
     CPBrowserStyleProperty('transition') -> WebkitTransition
@@ -369,6 +390,18 @@ function CPBrowserStyleProperty(aProperty)
                 r = candidates[PLATFORM_STYLE_JS_PROPERTIES['transform']] || nil;
                 break;
 
+            case 'animationend':
+                var candidates = {
+                        'WebkitAnimation' : 'webkitAnimationEnd',
+                        'MozAnimation'    : 'animationend',
+                        'OAnimation'      : 'oAnimationEnd',
+                        'msAnimation'     : 'MSAnimationEnd',
+                        'animation'       : 'animationend'
+                    };
+
+                r = candidates[PLATFORM_STYLE_JS_PROPERTIES['animation']] || nil;
+                break;
+
             default:
                 var prefixes = ["Webkit", "Moz", "O", "ms"],
                     strippedProperty = aProperty.split('-').join(' '),

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
@@ -83,7 +85,7 @@ var _CPEventPeriodicEventPeriod         = 0,
     BOOL                _suppressCappuccinoCut;
     BOOL                _suppressCappuccinoPaste;
 #endif
-    
+
     CPTrackingArea      _trackingArea;
 }
 
@@ -146,7 +148,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 
 /*!
     Creates a new mouse tracking event.
- 
+
     @param anEventType the event type
     @param aPoint the location of the cursor in the window specified by \c aWindowNumber
     @param modifierFlags a bitwise combination of the modifiers specified in the CPEvent globals
@@ -232,7 +234,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 {
     if ((anEventType != CPMouseEntered) && (anEventType != CPMouseExited) && (anEventType != CPCursorUpdate))
         [CPException raise:CPInternalInconsistencyException reason:"Invalid event type"];
-  
+
     if (self = [self _initWithType:anEventType])
     {
         _location = CGPointCreateCopy(aPoint);
@@ -243,7 +245,7 @@ var _CPEventPeriodicEventPeriod         = 0,
         _trackingArea = aTrackingArea;
         _window = [CPApp windowWithWindowNumber:aWindowNumber];
     }
-    
+
     return self;
 }
 
@@ -336,6 +338,14 @@ var _CPEventPeriodicEventPeriod         = 0,
     return _type;
 }
 
+/*!
+    Returns the subtype of the event.
+*/
+- (CPEventType)subtype
+{
+    return _subtype;
+}
+
 /*!
     Returns the event's associated window.
 */
@@ -633,7 +643,7 @@ var _CPEventPeriodicEventPeriod         = 0,
 {
     if ((_type !== CPMouseEntered) && (_type !== CPMouseExited) && (_type !== CPCursorUpdate))
         [CPException raise:CPInternalInconsistencyException format:@"You can't call trackingArea for events of type %#x", _type]
-    
+
     return _trackingArea;
 }
 

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/CPKeyValueBinding.j

@@ -918,6 +918,7 @@ CPTextColorBinding                        = @"textColor";
 CPTitleBinding                            = @"title";
 CPToolTipBinding                          = @"toolTip";
 CPValueBinding                            = @"value";
+CPAttributedStringBinding                 = @"attributedString";
 CPValueURLBinding                         = @"valueURL";
 CPValuePathBinding                        = @"valuePath";
 CPDataBinding                             = @"data";

AppKit/CPObjectController.j

@@ -192,6 +192,12 @@
 */
 - (void)setEntityName:(CPString)newEntityName
 {
+    if (!_managedProxy)
+    {
+        _managedProxy = [[_CPManagedProxy alloc] init];
+        _isUsingManagedProxy = YES;
+    }
+
     [_managedProxy setEntityName:newEntityName];
 }
 

AppKit/CPPasteboard.j

@@ -44,6 +44,7 @@ CPStringPboardType      = @"CPStringPboardType";
 CPURLPboardType         = @"CPURLPboardType";
 CPImagesPboardType      = @"CPImagesPboardType";
 CPVideosPboardType      = @"CPVideosPboardType";
+CPRTFPboardType         = @"CPRTFPboardType";
 
 UTF8PboardType          = @"public.utf8-plain-text";
 
@@ -51,8 +52,7 @@ UTF8PboardType          = @"public.utf8-plain-text";
 CPImagePboardType       = @"CPImagePboardType";
 
 
-var CPPasteboards = nil,
-    supportsNativePasteboard = NO;
+var CPPasteboards = nil;
 
 /*!
     @ingroup appkit
@@ -68,8 +68,6 @@ var CPPasteboards = nil,
 
     unsigned        _changeCount;
     CPString        _stateUID;
-
-    CPWebScriptObject _nativePasteboard;
 }
 
 /*
@@ -83,9 +81,6 @@ var CPPasteboards = nil,
     [self setVersion:1.0];
 
     CPPasteboards = @{};
-
-    if (typeof window.cpPasteboardWithName !== "undefined")
-        supportsNativePasteboard = YES;
 }
 
 /*!
@@ -128,12 +123,6 @@ var CPPasteboards = nil,
         _provided = @{};
 
         _changeCount = 0;
-
-        if (supportsNativePasteboard)
-        {
-            _nativePasteboard = window.cpPasteboardWithName(aName);
-            [self _synchronizePasteboard];
-        }
     }
 
     return self;
@@ -163,15 +152,6 @@ var CPPasteboards = nil,
         [_owners setObject:anOwner forKey:type];
     }
 
-    if (_nativePasteboard)
-    {
-        var nativeTypes = [types copy];
-        if ([types containsObject:CPStringPboardType])
-            nativeTypes.push(UTF8PboardType);
-
-        _nativePasteboard.addTypes_(nativeTypes);
-    }
-
     return ++_changeCount;
 }
 
@@ -182,12 +162,6 @@ var CPPasteboards = nil,
     @return the pasteboard's change count
 */
 - (unsigned)declareTypes:(CPArray)types owner:(id)anOwner
-{
-    [self _declareTypes:types owner:anOwner updateNativePasteboard:YES];
-}
-
-/*! @ignore */
-- (unsigned)_declareTypes:(CPArray)types owner:(id)anOwner updateNativePasteboard:(BOOL)shouldUpdate
 {
     [_types setArray:types];
 
@@ -201,16 +175,6 @@ var CPPasteboards = nil,
             [_owners setObject:anOwner forKey:_types[count]];
     }
 
-    if (_nativePasteboard && shouldUpdate)
-    {
-        var nativeTypes = [types copy];
-        if ([types containsObject:CPStringPboardType])
-            nativeTypes.push(UTF8PboardType);
-
-        _nativePasteboard.declareTypes_(nativeTypes);
-        _changeCount = _nativePasteboard.changeCount();
-    }
-
     return ++_changeCount;
 }
 
@@ -273,7 +237,6 @@ var CPPasteboards = nil,
 */
 - (CPArray)types
 {
-    [self _synchronizePasteboard];
     return _types;
 }
 
@@ -312,36 +275,6 @@ var CPPasteboards = nil,
     return nil;
 }
 
-- (void)_synchronizePasteboard
-{
-    if (_nativePasteboard && _nativePasteboard.changeCount() > _changeCount)
-    {
-        var nativeTypes = [_nativePasteboard.types() copy];
-        if ([nativeTypes containsObject:UTF8PboardType])
-            nativeTypes.push(CPStringPboardType);
-
-        [self _declareTypes:nativeTypes owner:self updateNativePasteboard:NO];
-
-        _changeCount = _nativePasteboard.changeCount();
-    }
-}
-
-/*! @ignore
-    method provided for integration with native pasteboard
-*/
-- (void)pasteboard:(CPPasteboard)aPasteboard provideDataForType:(CPString)aType
-{
-    if (aType === CPStringPboardType)
-    {
-        var string = _nativePasteboard.stringForType_(UTF8PboardType);
-
-        [self setString:string forType:CPStringPboardType];
-        [self setString:string forType:UTF8PboardType];
-    }
-    else
-        [self setString:_nativePasteboard.stringForType_(aType) forType:aType];
-}
-
 /*!
     Returns the property list for the specified data type
     @param aType the requested data type

AppKit/CPPopUpButton.j

@@ -847,7 +847,17 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 {
     var count = [aValue count],
         options = [_info objectForKey:CPOptionsKey],
-        offset = [self _getInsertNullOffset];
+        offset = [self _getInsertNullOffset],
+        selectedBindingInfo = [_source infoForBinding:CPSelectedObjectBinding],
+        selectedObject = nil;
+
+    if (selectedBindingInfo)
+    {
+        var destination = [selectedBindingInfo objectForKey:CPObservedObjectKey],
+            keyPath = [selectedBindingInfo objectForKey:CPObservedKeyPathKey];
+
+        selectedObject = [destination valueForKeyPath:keyPath];
+    }
 
     if (count + offset != [_source numberOfItems])
     {
@@ -858,9 +868,19 @@ CPPopUpButtonStatePullsDown = CPThemeState("pulls-down");
 
         for (var i = 0; i < count; i++)
         {
-            var item = [[CPMenuItem alloc] initWithTitle:@"" action:NULL keyEquivalent:nil];
-            [self _setValue:[aValue objectAtIndex:i] forItem:item withOptions:options];
+            var item = [[CPMenuItem alloc] initWithTitle:@"" action:NULL keyEquivalent:nil],
+                itemValue = [aValue objectAtIndex:i];
+
+            [self _setValue:itemValue forItem:item withOptions:options];
             [_source addItem:item];
+
+            // Select this item if it is the one selected by the selected object binding
+            // This is needed if the selected object binding is set before the items
+            // from the content binding
+            if (itemValue === selectedObject)
+            {
+                [_source setSelectedIndex:[_source numberOfItems] - 1];
+            }
         }
     }
     else

AppKit/CPRuleEditor/CPPredicateEditorRowTemplate.j

@@ -471,9 +471,11 @@ CPTransformableAttributeType = 1800;
 
     var value;
     if (attributeType >= CPInteger16AttributeType && attributeType <= CPFloatAttributeType)
-        value = [aView intValue];
+        value = [aView floatValue];
     else if (attributeType == CPBooleanAttributeType)
         value = [aView state];
+    else if (attributeType == CPDateAttributeType)
+        value = [aView dateValue];
     else
         value = [aView stringValue];
 

AppKit/CPRuleEditor/CPRuleEditor.j

@@ -146,7 +146,7 @@ var CPRuleEditorItemPBoardType  = @"CPRuleEditorItemPBoardType",
             @"slice-top-border-color": [CPNull null],
             @"slice-bottom-border-color": [CPNull null],
             @"slice-last-bottom-border-color": [CPNull null],
-            @"font": [CPNull null],
+            @"font": [CPFont systemFontOfSize:12],
             @"font-color": [CPNull null],
             @"add-image": [CPNull null],
             @"remove-image": [CPNull null],

AppKit/CPRuleEditor/_CPRuleEditorViewSliceRow.j

@@ -366,11 +366,12 @@
         count       = [_ruleOptionViews count],
         sliceFrame  = [self frame],
         image       = [_ruleEditor _imageAdd],
+        imageSize   = image ? [image size] : CGSizeMake(0,0),
 
-        buttonFrame = CGRectMake(CGRectGetWidth(sliceFrame) - [image size].width - [self _rowButtonsRightHorizontalPadding], ([_ruleEditor rowHeight] - [image size].height) / 2 - 1, [image size].width, [image size].height);
+        buttonFrame = CGRectMake(CGRectGetWidth(sliceFrame) - imageSize.width - [self _rowButtonsRightHorizontalPadding], ([_ruleEditor rowHeight] - imageSize.height) / 2 - 1, imageSize.width, imageSize.height);
 
     [_addButton setFrame:buttonFrame];
-    buttonFrame.origin.x -= [image size].width + [self _rowButtonsInterviewHorizontalPadding];
+    buttonFrame.origin.x -= imageSize.width + [self _rowButtonsInterviewHorizontalPadding];
     [_subtractButton setFrame:buttonFrame];
 
     if (widthChanged)

AppKit/CPScroller.j

@@ -316,7 +316,7 @@ CPThemeStateScrollerKnobDark    = CPThemeState("scroller-knob-dark");
     // The ordering of these tests is important.  We check the knob and
     // page rects first since they may overlap with the arrows.
 
-    if (![self hasThemeState:CPThemeStateSelected])
+    if (![self hasThemeState:CPThemeStateSelected] && ![self hasThemeState:CPThemeStateScrollViewLegacy])
         return CPScrollerNoPart;
 
     if (CGRectContainsPoint([self rectForPart:CPScrollerKnob], aPoint))

AppKit/CPSegmentedControl.j

@@ -604,7 +604,12 @@ CPSegmentSwitchTrackingMomentary = 2;
 - (CPView)createEphemeralSubviewNamed:(CPString)aName
 {
     if ([aName hasPrefix:@"segment-content"])
-        return [[_CPImageAndTextView alloc] initWithFrame:CGRectMakeZero()];
+    {
+        var view = [[_CPImageAndTextView alloc] initWithFrame:CGRectMakeZero()];
+        [view _setUsesSingleLineMode:YES];
+
+        return view;
+    }
 
     return [[CPView alloc] initWithFrame:CGRectMakeZero()];
 }

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,21 +57,67 @@ CPStringSizeCachingEnabled = YES;
     return [self sizeWithFont:aFont inWidth:NULL];
 }
 
-- (CGSize)sizeWithFont:(CPFont)aFont inWidth:(float)aWidth
++ (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] = [];
+
+    if (!aWidth)
+        aWidth = '0';
+
+    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);
 }
 
+- (CGSize)sizeWithFont:(CPFont)aFont inWidth:(float)aWidth
+{
+    var size = [self _sizeWithFont:aFont inWidth:aWidth];
+    return CGSizeMake(CEIL(size.width), size.height);
+}
+
 @end

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/CPTableColumn.j

@@ -537,6 +537,14 @@ CPTableColumnUserResizingMask   = 1 << 1;
     return _headerToolTip;
 }
 
+/*!
+    @ignore
+*/
+- (CPString)description
+{
+    return [CPString stringWithFormat:"<%@ 0x%@ identifier=%@>", [self className], [CPString stringWithHash:[self UID]], [self identifier]];
+}
+
 @end
 
 @implementation CPTableColumnValueBinder : CPBinder

AppKit/CPTableHeaderView.j

@@ -417,8 +417,7 @@ var CPTableHeaderViewResizeZone = 3.0,
     }
     else if (_isDragging)
     {
-        // Disable autoscrolling until it behaves correctly.
-        //[self _autoscroll:theEvent localLocation:currentLocation];
+        [self _autoscroll:theEvent localLocation:currentLocation];
         [self _dragTableColumn:_activeColumn to:currentLocation];
     }
     else // tracking a press, could become a drag
@@ -466,9 +465,12 @@ var CPTableHeaderViewResizeZone = 3.0,
 - (void)updateTrackingAreas
 {
     [self removeAllTrackingAreas];
-    
+
     var options = CPTrackingCursorUpdate | CPTrackingActiveInKeyWindow;
-    
+
+    if (!_tableView)
+      return;
+
     for (var i = 0; i < _tableView._tableColumns.length; i++)
         [self addTrackingArea:[[CPTrackingArea alloc] initWithRect:[self _cursorRectForColumn:i]
                                                            options:options
@@ -679,20 +681,21 @@ var CPTableHeaderViewResizeZone = 3.0,
     [_columnDragClipView removeFromSuperview];
     [_tableView _setDraggedColumn:-1];
 
-    var headerView = [[[_tableView tableColumns] objectAtIndex:aColumnIndex] headerView];
+    var tableColumn = [[_tableView tableColumns] objectAtIndex:aColumnIndex],
+        headerView = [tableColumn headerView];
 
     [[headerView subviews] makeObjectsPerformSelector:@selector(setHidden:) withObject:NO];
 
     if (_tableView._draggedColumnIsSelected)
         [headerView setThemeState:CPThemeStateSelected];
 
-    var columnRect = [_tableView rectOfColumn:aColumnIndex];
-
     [_tableView _reloadDataViews];
     [[_tableView headerView] setNeedsLayout];
 
     [[CPCursor arrowCursor] set];
     [self updateTrackingAreas];
+
+    [_tableView _sendDelegateDidDragTableColumn:tableColumn];
 }
 
 - (BOOL)_shouldResizeTableColumn:(CPInteger)aColumnIndex at:(CGPoint)aPoint

AppKit/CPTableView.j

@@ -203,7 +203,7 @@ CPTableViewFirstColumnOnlyAutoresizingStyle = 5;
     @ingroup appkit
     @class CPTableView
 
-    CPTableView object displays record-oriented data in a table and
+    A table view control displays record-oriented data in a table and
     allows the user to edit values and resize and rearrange columns.
     A CPTableView requires you to either set a data source which implements
     @ref numberofrows "numberOfRowsInTableView:" and @ref objectValueForTable "tableView:objectValueForTableColumn:row:",
@@ -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];
     }
 }
 
@@ -5752,10 +5748,10 @@ Your delegate can implement this method to avoid subclassing the tableview to ad
     @ignore
     Call the delegate didDragTableColumn with the given tableColumn
 */
-- (void)_sendDelegateDidDragTableColumn:(CPInteger)column
+- (void)_sendDelegateDidDragTableColumn:(CPTableColumn)aTableColumn
 {
     if (_implementedDelegateMethods & CPTableViewDelegate_tableView_didDragTableColumn_)
-        [_delegate tableView:self didDragTableColumn:_tableColumns[column]];
+        [_delegate tableView:self didDragTableColumn:aTableColumn];
 }
 
 /*!

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,279 @@ 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)_plainStringForPasting
+{
+    return [[CPPasteboard generalPasteboard] stringForType: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/CPTextField.j

@@ -77,26 +77,16 @@ function CPTextFieldBlurFunction(anEvent, owner, domElement, inputElement, resig
 
     var ownerWindow = [owner window];
 
-    if (!resigning && [ownerWindow isKeyWindow])
+    if (!resigning && [ownerWindow isKeyWindow] && [ownerWindow firstResponder] === owner)
     {
         /*
-            Browsers blur text fields when a click occurs anywhere outside the text field. That is normal for browsers, but in Cocoa the key view retains focus unless the click target accepts first responder. So if we lost focus but were not told to resign and our window is still key, restore focus,
-            but only if the text field is completely within the browser window. If we restore focus when it
-            is off screen, the entire body scrolls out of our control.
+        Previously we had code here which would force the input to regain focus if the input lost focus without the CPTextField having actually lost first responder status. This typically happened because the user clicked away from the input in the browser, without clicking on something that could become the first responder. In the browser, clicking outside of an input blurs it, but in Cocoa and Cappuccino it does not (unless you actually click something that will become the first responder).
+
+        That refocusing code has now been removed because we simply prevent the default action on clicks in the browser instead, which combined with the fix in 58d5d7d7, successfully prevents unintentional focus loss in (at least) Safari 9.1.1, Chrome 51 and Safari for iOS 9.3 when you click outside of a text field.
+
+        Now we can still lose focus unexpectedly: this is when the 'done' button is tapped on the virtual keyboard of a mobile device. In this case we actually do want to resign first responder status, because that is what the done button should do (and if we did not the keyboard would go away and then immediately come back which looks dumb and isn't what the user wanted).
         */
-        if ([owner _isWithinUsablePlatformRect])
-        {
-            [[CPRunLoop mainRunLoop] performBlock:function()
-            {
-                // This will prevent to jump to the focused element
-                var previousScrollingOrigin = [owner _scrollToVisibleRectAndReturnPreviousOrigin];
-
-                inputElement.focus();
-
-                [owner _restorePreviousScrollingOrigin:previousScrollingOrigin];
-            } 
-            argument:nil order:0 modes:[CPDefaultRunLoopMode]];
-        }
+        [ownerWindow makeFirstResponder:nil];
     }
 
     CPTextFieldHandleBlur(anEvent, @ref(owner));
@@ -403,7 +393,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     else
         [self unsetThemeState:CPThemeStateEditable];
 
-    // We only allow first responder status if the field is enable, and editable or selectable.
+    // We only allow first responder status if the field is enabled, and editable or selectable.
     if (!(shouldBeEditable && ![self isSelectable]) && [[self window] firstResponder] === self)
         [[self window] makeFirstResponder:nil];
 
@@ -411,6 +401,8 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
         [self setThemeState:CPThemeStateEditable];
     else
         [self unsetThemeState:CPThemeStateEditable];
+
+    [self updateTrackingAreas];
 }
 
 /*!
@@ -432,6 +424,8 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     // We only allow first responder status if the field is enabled.
     if (!shouldBeEnabled && [[self window] firstResponder] === self)
         [[self window] makeFirstResponder:nil];
+
+    [self updateTrackingAreas];
 }
 
 /*!
@@ -441,6 +435,8 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 - (void)setSelectable:(BOOL)aFlag
 {
     _isSelectable = aFlag;
+
+    [self updateTrackingAreas];
 }
 
 /*!
@@ -839,7 +835,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
         [self _resignFirstKeyResponder];
 
     _isEditing = NO;
-    
+
     if ([self isEditable])
     {
         [self textDidEndEditing:[CPNotification notificationWithName:CPControlTextDidEndEditingNotification object:self userInfo:@{"CPTextMovement": [self _currentTextMovement]}]];
@@ -999,14 +995,11 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
     [self textDidChange:[CPNotification notificationWithName:CPControlTextDidChangeNotification object:self userInfo:nil]];
 }
 
-- (void)mouseMoved:(CPEvent)anEvent
-{
-    [super mouseMoved:anEvent];
-    [self _updateCursorForEvent:anEvent];
-}
-
 - (void)mouseDown:(CPEvent)anEvent
 {
+    if (![self isEnabled])
+        return [[self nextResponder] mouseDown:anEvent];
+
     // Don't track! (ever?)
     if ([self isEditable] && [self isEnabled])
     {
@@ -1261,27 +1254,6 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
         [_delegate controlTextDidEndEditing:note];
 }
 
-- (void)_updateCursorForEvent:(CPEvent)anEvent
-{
-    var frame = CGRectMakeCopy([self frame]),
-        contentInset = [self currentValueForThemeAttribute:@"content-inset"];
-
-    frame = [[self superview] convertRectToBase:CGRectInsetByInset(frame, contentInset)];
-
-    if ([self isEnabled] && ([self isSelectable] || [self isEditable]) && CGRectContainsPoint(frame, [anEvent locationInWindow]))
-    {
-#if PLATFORM(DOM)
-        self._DOMElement.style.cursor = "text";
-#endif
-    }
-    else
-    {
-#if PLATFORM(DOM)
-        self._DOMElement.style.cursor = "default";
-#endif
-    }
-}
-
 /*!
     Returns the string in the text field.
 */
@@ -2015,7 +1987,7 @@ CPTextFieldStatePlaceholder = CPThemeState("placeholder");
 
     frame.origin = [wind convertBaseToGlobal:frame.origin];
 
-    // Here we restore the the previous scrolling posiition
+    // Here we restore the previous scrolling posiition
     [self _restorePreviousScrollingOrigin:previousScrollingOrigin];
 
     return (CGRectGetMinX(frame) >= CGRectGetMinX(usableRect) &&
@@ -2202,4 +2174,29 @@ var CPTextFieldIsEditableKey            = "CPTextFieldIsEditableKey",
     [_source setObjectValue:aValue];
 }
 
-@end
+@end
+
+@implementation CPTextField (CPTrackingArea)
+
+- (void)updateTrackingAreas
+{
+    [self removeAllTrackingAreas];
+
+    if ([self isEnabled] && (_isEditable || _isSelectable))
+    {
+        var myBounds     = CGRectMakeCopy([self bounds]),
+            contentInset = [self currentValueForThemeAttribute:@"content-inset"];
+
+        [self addTrackingArea:[[CPTrackingArea alloc] initWithRect:CGRectInsetByInset(myBounds, contentInset)
+                                                       options:CPTrackingMouseEnteredAndExited | CPTrackingCursorUpdate | CPTrackingActiveInKeyWindow
+                                                         owner:self
+                                                      userInfo:nil]];
+    }
+}
+
+- (void)cursorUpdate:(CPEvent)anEvent
+{
+    [[CPCursor IBeamCursor] set];
+}
+
+@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,429 @@
+/*
+ *  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,793 @@
+/* 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 (new RegExp("[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 (new RegExp("[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 + '') !== 'null' && (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 (new RegExp("[a-zA-Z]").test(ch))
+    {
+        keyword += ch;
+        ch = rtf.charAt(++_currentParseIndex);
+    }
+
+    if (ch == '-')
+    {
+        fNeg = true;
+        ch = rtf.charAt(++_currentParseIndex);
+    }
+
+    fParam = true;
+
+    while (new RegExp("[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
+{
+    rtf = rtf.replace(/\\\n/g, "\\par\n")
+
+    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/CPTheme.j

@@ -322,7 +322,7 @@ function ThemeState(stateNames)
     var stateNameKeys = [];
     this._stateNames = {};
 
-    for (key in stateNames)
+    for (var key in stateNames)
     {
         if (!stateNames.hasOwnProperty(key))
             continue;

AppKit/CPView.j

@@ -112,6 +112,11 @@ CPViewHeightSizable = 16;
 */
 CPViewMaxYMargin    = 32;
 
+_CPViewWillAppearNotification        = @"CPViewWillAppearNotification";
+_CPViewDidAppearNotification         = @"CPViewDidAppearNotification";
+_CPViewWillDisappearNotification     = @"CPViewWillDisappearNotification";
+_CPViewDidDisappearNotification      = @"CPViewDidDisappearNotification";
+
 CPViewBoundsDidChangeNotification   = @"CPViewBoundsDidChangeNotification";
 CPViewFrameDidChangeNotification    = @"CPViewFrameDidChangeNotification";
 
@@ -172,6 +177,7 @@ var CPViewHighDPIDrawingEnabled = YES;
     CPArray             _registeredDraggedTypesArray;
 
     BOOL                _isHidden;
+    BOOL                _isHiddenOrHasHiddenAncestor;
     BOOL                _hitTests;
     BOOL                _clipsToBounds;
 
@@ -243,6 +249,11 @@ var CPViewHighDPIDrawingEnabled = YES;
 
     CPMutableArray      _trackingAreas          @accessors(getter=trackingAreas, copy);
     BOOL                _inhibitUpdateTrackingAreas;
+
+    id                  _animator;
+    CPDictionary        _animationsDictionary;
+    BOOL                _inhibitDOMUpdates      @accessors(setter=_setInhibitDOMUpdates);
+    BOOL                _forceUpdates           @accessors(setter=_setForceUpdates);
 }
 
 /*
@@ -369,6 +380,7 @@ var CPViewHighDPIDrawingEnabled = YES;
 
         _opacity = 1.0;
         _isHidden = NO;
+        _isHiddenOrHasHiddenAncestor = NO;
         _hitTests = YES;
 
         _hierarchyScaleSize = CGSizeMake(1.0 , 1.0);
@@ -389,14 +401,19 @@ var CPViewHighDPIDrawingEnabled = YES;
         _DOMImageSizes = [];
 #endif
 
+        _animator = nil;
+        _animationsDictionary = @{};
+
         [self _setupViewFlags];
         [self _loadThemeAttributes];
+
+        _inhibitDOMUpdates = NO;
+        _forceUpdates = NO;
     }
 
     return self;
 }
 
-
 /*!
     Sets the tooltip for the receiver.
 
@@ -404,7 +421,7 @@ var CPViewHighDPIDrawingEnabled = YES;
 */
 - (void)setToolTip:(CPString)aToolTip
 {
-    if (_toolTip == aToolTip)
+    if (_toolTip === aToolTip)
         return;
 
     if (aToolTip && ![aToolTip isKindOfClass:CPString])
@@ -562,7 +579,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];
 
@@ -591,8 +608,9 @@ var CPViewHighDPIDrawingEnabled = YES;
         // Remove the view from its previous superview.
         [aSubview _removeFromSuperview];
 
+        [aSubview _postViewWillAppearNotification];
         // Set ourselves as the superview.
-        aSubview._superview = self;
+        [aSubview _setSuperview:self];
     }
 
     if (anIndex === CPNotFound || anIndex >= count)
@@ -617,11 +635,6 @@ var CPViewHighDPIDrawingEnabled = YES;
     [aSubview setNextResponder:self];
     [aSubview _scaleSizeUnitSquareToSize:[self _hierarchyScaleSize]];
 
-    // If the subview is not hidden and one of its ancestors is hidden,
-    // notify the subview that it is now hidden.
-    if (![aSubview isHidden] && [self isHiddenOrHasHiddenAncestor])
-        [aSubview _notifyViewDidHide];
-
     [aSubview viewDidMoveToSuperview];
 
     // Set the subview's window to our own.
@@ -682,6 +695,7 @@ var CPViewHighDPIDrawingEnabled = YES;
     [[self window] _dirtyKeyViewLoop];
 
     [_superview willRemoveSubview:self];
+    [self _postViewWillDisappearNotification];
 
     [_superview._subviews removeObjectIdenticalTo:self];
 
@@ -691,13 +705,10 @@ var CPViewHighDPIDrawingEnabled = YES;
 
     // If the view is not hidden and one of its ancestors is hidden,
     // notify the view that it is now unhidden.
-    if (!_isHidden && [_superview isHiddenOrHasHiddenAncestor])
-        [self _notifyViewDidUnhide];
+    [self _setSuperview:nil];
 
     [self _notifyWindowDidResignKey];
     [self _notifyViewDidResignFirstResponder];
-
-    _superview = nil;
 }
 
 /*!
@@ -857,7 +868,7 @@ var CPViewHighDPIDrawingEnabled = YES;
 
     do
     {
-        if (view == aView)
+        if (view === aView)
             return YES;
     } while(view = [view superview])
 
@@ -972,7 +983,7 @@ var CPViewHighDPIDrawingEnabled = YES;
 
 - (CPView)viewWithTag:(CPInteger)aTag
 {
-    if ([self tag] == aTag)
+    if ([self tag] === aTag)
         return self;
 
     var index = 0,
@@ -1007,7 +1018,7 @@ var CPViewHighDPIDrawingEnabled = YES;
 */
 - (void)setFrame:(CGRect)aFrame
 {
-    if (CGRectEqualToRect(_frame, aFrame))
+    if (CGRectEqualToRect(_frame, aFrame) && !_forceUpdates)
         return;
 
     _inhibitFrameAndBoundsChangedNotifications = YES;
@@ -1024,7 +1035,7 @@ var CPViewHighDPIDrawingEnabled = YES;
         [[self superview] viewFrameChanged:[[CPNotification alloc] initWithName:CPViewFrameDidChangeNotification object:self userInfo:nil]];
 
     if (!_inhibitUpdateTrackingAreas)
-        [self _updateTrackingAreas];
+        [self _updateTrackingAreasWithRecursion:YES];
 }
 
 /*!
@@ -1078,7 +1089,7 @@ var CPViewHighDPIDrawingEnabled = YES;
 {
     var origin = _frame.origin;
 
-    if (!aPoint || CGPointEqualToPoint(origin, aPoint))
+    if (!aPoint || (CGPointEqualToPoint(origin, aPoint) && !_forceUpdates))
         return;
 
     origin.x = aPoint.x;
@@ -1091,13 +1102,16 @@ var CPViewHighDPIDrawingEnabled = YES;
         [[self superview] viewFrameChanged:[[CPNotification alloc] initWithName:CPViewFrameDidChangeNotification object:self userInfo:nil]];
 
 #if PLATFORM(DOM)
-    var transform = _superview ? _superview._boundsTransform : NULL;
+    if (!_inhibitDOMUpdates)
+    {
+        var transform = _superview ? _superview._boundsTransform : NULL;
 
-    CPDOMDisplayServerSetStyleLeftTop(_DOMElement, transform, origin.x, origin.y);
+        CPDOMDisplayServerSetStyleLeftTop(_DOMElement, transform, origin.x, origin.y);
+    }
 #endif
 
     if (!_inhibitUpdateTrackingAreas && !_inhibitFrameAndBoundsChangedNotifications)
-        [self _updateTrackingAreas];
+        [self _updateTrackingAreasWithRecursion:YES];
 }
 
 /*!
@@ -1110,7 +1124,7 @@ var CPViewHighDPIDrawingEnabled = YES;
 {
     var size = _frame.size;
 
-    if (!aSize || CGSizeEqualToSize(size, aSize))
+    if (!aSize || (CGSizeEqualToSize(size, aSize) && !_forceUpdates))
         return;
 
     var oldSize = CGSizeMakeCopy(size);
@@ -1251,7 +1265,7 @@ var CPViewHighDPIDrawingEnabled = YES;
         [[self superview] viewFrameChanged:[[CPNotification alloc] initWithName:CPViewFrameDidChangeNotification object:self userInfo:nil]];
 
     if (!_inhibitUpdateTrackingAreas && !_inhibitFrameAndBoundsChangedNotifications)
-        [self _updateTrackingAreas];
+        [self _updateTrackingAreasWithRecursion:!_autoresizesSubviews];
 }
 
 /*!
@@ -1264,7 +1278,8 @@ var CPViewHighDPIDrawingEnabled = YES;
 #if PLATFORM(DOM)
     var scale = [self scaleSize];
 
-    CPDOMDisplayServerSetStyleSize(_DOMElement, aSize.width * 1 / scale.width, aSize.height * 1 / scale.height);
+    if (!_inhibitDOMUpdates)
+        CPDOMDisplayServerSetStyleSize(_DOMElement, aSize.width * 1 / scale.width, aSize.height * 1 / scale.height);
 
     if (_DOMContentsElement)
     {
@@ -1300,7 +1315,7 @@ var CPViewHighDPIDrawingEnabled = YES;
         [[self superview] viewBoundsChanged:[[CPNotification alloc] initWithName:CPViewBoundsDidChangeNotification object:self userInfo:nil]];
 
     if (!_inhibitUpdateTrackingAreas)
-        [self _updateTrackingAreas];
+        [self _updateTrackingAreasWithRecursion:YES];
 }
 
 /*!
@@ -1368,7 +1383,7 @@ var CPViewHighDPIDrawingEnabled = YES;
         [[self superview] viewBoundsChanged:[[CPNotification alloc] initWithName:CPViewBoundsDidChangeNotification object:self userInfo:nil]];
 
     if (!_inhibitUpdateTrackingAreas && !_inhibitFrameAndBoundsChangedNotifications)
-        [self _updateTrackingAreas];
+        [self _updateTrackingAreasWithRecursion:YES];
 }
 
 /*!
@@ -1412,7 +1427,7 @@ var CPViewHighDPIDrawingEnabled = YES;
         [[self superview] viewBoundsChanged:[[CPNotification alloc] initWithName:CPViewBoundsDidChangeNotification object:self userInfo:nil]];
 
     if (!_inhibitUpdateTrackingAreas && !_inhibitFrameAndBoundsChangedNotifications)
-        [self _updateTrackingAreas];
+        [self _updateTrackingAreasWithRecursion:YES];
 }
 
 
@@ -1424,7 +1439,7 @@ var CPViewHighDPIDrawingEnabled = YES;
 {
     var mask = [self autoresizingMask];
 
-    if (mask == CPViewNotSizable)
+    if (mask === CPViewNotSizable)
         return;
 
     var frame = _superview._frame,
@@ -1593,10 +1608,8 @@ var CPViewHighDPIDrawingEnabled = YES;
 
 //  FIXME: Should we return to visibility?  This breaks in FireFox, Opera, and IE.
 //    _DOMElement.style.visibility = (_isHidden = aFlag) ? "hidden" : "visible";
-    _isHidden = aFlag;
-
 #if PLATFORM(DOM)
-    _DOMElement.style.display = _isHidden ? "none" : "block";
+    _DOMElement.style.display = aFlag ? "none" : "block";
 #endif
 
     if (aFlag)
@@ -1607,7 +1620,7 @@ var CPViewHighDPIDrawingEnabled = YES;
         {
             do
             {
-               if (self == view)
+               if (self === view)
                {
                   [_window makeFirstResponder:[self nextValidKeyView]];
                   break;
@@ -1616,33 +1629,89 @@ var CPViewHighDPIDrawingEnabled = YES;
             while (view = [view superview]);
         }
 
-        [self _notifyViewDidHide];
+        [self _postViewWillDisappearNotification];
+        [self _recursiveGainedHiddenAncestor];
     }
     else
     {
         [self setNeedsDisplay:YES];
-        [self _notifyViewDidUnhide];
+
+        [self _postViewWillAppearNotification];
+        [self _recursiveLostHiddenAncestor];
     }
+
+    _isHidden = aFlag;
 }
 
-- (void)_notifyViewDidHide
+- (void)_postViewWillAppearNotification
 {
-    [self viewDidHide];
-
-    var count = [_subviews count];
-
-    while (count--)
-        [_subviews[count] _notifyViewDidHide];
+    [[CPNotificationCenter defaultCenter] postNotificationName:_CPViewWillAppearNotification object:self userInfo:nil];
 }
 
-- (void)_notifyViewDidUnhide
+- (void)_postViewDidAppearNotification
 {
-    [self viewDidUnhide];
+    [[CPNotificationCenter defaultCenter] postNotificationName:_CPViewDidAppearNotification object:self userInfo:nil];
+}
 
-    var count = [_subviews count];
+- (void)_postViewWillDisappearNotification
+{
+    [[CPNotificationCenter defaultCenter] postNotificationName:_CPViewWillDisappearNotification object:self userInfo:nil];
+}
 
-    while (count--)
-        [_subviews[count] _notifyViewDidUnhide];
+- (void)_postViewDidDisappearNotification
+{
+    [[CPNotificationCenter defaultCenter] postNotificationName:_CPViewDidDisappearNotification object:self userInfo:nil];
+}
+
+- (void)_setSuperview:(CPView)aSuperview
+{
+    var hasOldSuperview = (_superview !== nil),
+        hasNewSuperview = (aSuperview !== nil),
+        oldSuperviewIsHidden = hasOldSuperview && [_superview isHiddenOrHasHiddenAncestor],
+        newSuperviewIsHidden = hasNewSuperview && [aSuperview isHiddenOrHasHiddenAncestor];
+
+    if (!newSuperviewIsHidden && oldSuperviewIsHidden)
+        [self _recursiveLostHiddenAncestor];
+
+    if (newSuperviewIsHidden && !oldSuperviewIsHidden)
+        [self _recursiveGainedHiddenAncestor];
+
+    _superview = aSuperview;
+
+    if (hasOldSuperview)
+        [self _postViewDidDisappearNotification];
+
+    if (hasNewSuperview)
+        [self _postViewDidAppearNotification];
+}
+
+- (void)_recursiveLostHiddenAncestor
+{
+    if (_isHiddenOrHasHiddenAncestor)
+    {
+        _isHiddenOrHasHiddenAncestor = NO;
+        [self viewDidUnhide];
+    }
+
+    [_subviews enumerateObjectsUsingBlock:function(view, idx, stop)
+    {
+        [view _recursiveLostHiddenAncestor];
+    }];
+}
+
+- (void)_recursiveGainedHiddenAncestor
+{
+    if (!_isHidden)
+    {
+        [self viewDidHide];
+    }
+
+    _isHiddenOrHasHiddenAncestor = YES;
+
+    [_subviews enumerateObjectsUsingBlock:function(view, idx, stop)
+    {
+        [view _recursiveGainedHiddenAncestor];
+    }];
 }
 
 /*!
@@ -1677,7 +1746,7 @@ var CPViewHighDPIDrawingEnabled = YES;
 */
 - (void)setAlphaValue:(float)anAlphaValue
 {
-    if (_opacity == anAlphaValue)
+    if (_opacity === anAlphaValue)
         return;
 
     _opacity = anAlphaValue;
@@ -1712,12 +1781,7 @@ var CPViewHighDPIDrawingEnabled = YES;
 */
 - (BOOL)isHiddenOrHasHiddenAncestor
 {
-    var view = self;
-
-    while (view && ![view isHidden])
-        view = [view superview];
-
-    return view !== nil;
+    return _isHiddenOrHasHiddenAncestor;
 }
 
 /*!
@@ -1881,10 +1945,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;
@@ -1927,7 +1991,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;
@@ -1982,10 +2046,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
     {
@@ -2019,7 +2085,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,
@@ -2080,7 +2146,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;
@@ -2112,7 +2178,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;
@@ -2851,8 +2917,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
 {
@@ -3074,7 +3140,7 @@ setBoundsOrigin:
 */
 - (void)setLayer:(CALayer)aLayer
 {
-    if (_layer == aLayer)
+    if (_layer === aLayer)
         return;
 
     if (_layer)
@@ -3488,14 +3554,14 @@ setBoundsOrigin:
  Invoked automatically when the view’s geometry changes such that its tracking areas need to be recalculated.
 
  You should override this method to remove out of date tracking areas and add recomputed tracking areas;
- 
+
  Cocoa calls this on every view, whereas they have tracking area(s) or not.
  Cappuccino behaves differently :
  - updateTrackingAreas is called when placing a view in the view hierarchy (that is in a window)
  - if you have only CPTrackingInVisibleRect tracking areas attached to a view, it will not be called again (until you move the view in the hierarchy)
  - if you have at least one non-CPTrackingInVisibleRect tracking area attached, it will be called every time the view geometry could be modified
    You don't have to touch to CPTrackingInVisibleRect tracking areas, they will be automatically updated
- 
+
  Please note that it is the owner of a tracking area who is called for updateTrackingAreas.
  But, if a view without any tracking area is inserted in the view hierarchy (that is, in a window), the view is called for updateTrackingAreas.
  This enables you to use updateTrackingArea to initially attach your tracking areas to the view.
@@ -3507,16 +3573,16 @@ setBoundsOrigin:
 
 /*!
  This utility method is intended for CPView subclasses overriding updateTrackingAreas
- 
+
  Typical use would be :
- 
+
  - (void)updateTrackingAreas
  {
       [self removeAllTrackingAreas];
- 
+
       ... add your specific updated tracking areas ...
   }
- 
+
 */
 - (void)removeAllTrackingAreas
 {
@@ -3535,21 +3601,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
@@ -3646,7 +3712,6 @@ var CPViewAutoresizingMaskKey       = @"CPViewAutoresizingMask",
 
         _window = [aCoder decodeObjectForKey:CPViewWindowKey];
         _superview = [aCoder decodeObjectForKey:CPViewSuperviewKey];
-
         // We have to manually add the subviews so that they will receive
         // viewWillMoveToSuperview: and viewDidMoveToSuperview:
         _subviews = [];
@@ -3701,6 +3766,7 @@ var CPViewAutoresizingMaskKey       = @"CPViewAutoresizingMask",
 #endif
 
         [self setHidden:[aCoder decodeBoolForKey:CPViewIsHiddenKey]];
+        _isHiddenOrHasHiddenAncestor = NO;
 
         if ([aCoder containsValueForKey:CPViewOpacityKey])
             [self setAlphaValue:[aCoder decodeIntForKey:CPViewOpacityKey]];

AppKit/CPViewController.j

@@ -150,7 +150,7 @@ var CPViewControllerCachedCibs;
     If you use Interface Builder to create your views, and you initialize the
     controller using the initWithCibName:bundle: methods, then you MUST NOT override
     this method.
-    
+
     @note When using this method, the cib loading system is synchronous.
     See the loadViewWithCompletionHandler: method for an asynchronous loading.
 */
@@ -178,12 +178,12 @@ var CPViewControllerCachedCibs;
 }
 
 /*!
-    Loads asynchronously the cib and creates the view that the controller manages.
-    
-    @param aHandler A function passing the loaded view as the first argument
-    and a network error or nil as the second argument: function(view, error).
-    
-    @note If the view has already been loaded, the completion handler is run immediatly 
+    Asynchronously load the cib and create the view that the controller manages.
+
+    @param aHandler a function which will be passed the loaded view as the first
+    argument and a network error or nil as the second argument: function(view, error).
+
+    @note If the view has already been loaded, the completion handler is run immediatly
     and the process is synchronous.
 */
 - (void)loadViewWithCompletionHandler:(Function/*(view, error)*/)aHandler
@@ -213,11 +213,11 @@ var CPViewControllerCachedCibs;
                 if (anError == nil)
                 {
                     var data = [CPData dataWithRawString:aData],
-                        aCib = [[CPCib alloc] _initWithData:data bundle:_cibBundle cibName:_cibName];
+                          aCib = [[CPCib alloc] _initWithData:data bundle:_cibBundle cibName:_cibName];
 
                     [CPViewControllerCachedCibs setObject:aCib forKey:_cibName];
                     [aCib instantiateCibWithExternalNameTable:_cibExternalNameTable];
-                    aHandler(_view, nil);
+                    [self _viewDidLoadWithCompletionHandler:aHandler];
                 }
                 else
                 {
@@ -228,13 +228,13 @@ var CPViewControllerCachedCibs;
         else
         {
             [cib instantiateCibWithExternalNameTable:_cibExternalNameTable];
-            aHandler(_view, nil);
+            [self _viewDidLoadWithCompletionHandler:aHandler];
         }
     }
     else
     {
         _view = [CPView new];
-        aHandler(_view, nil);
+        [self _viewDidLoadWithCompletionHandler:aHandler];
     }
 }
 
@@ -292,6 +292,16 @@ var CPViewControllerCachedCibs;
     [self didChangeValueForKey:"isViewLoaded"];
 }
 
+- (void)_viewDidLoadWithCompletionHandler:(Function)aHandler
+{
+    [self _registerOrUnregister:YES notificationsForView:_view];
+
+    [self willChangeValueForKey:"isViewLoaded"];
+    aHandler(_view, nil);
+    _isViewLoaded = YES;
+    [self didChangeValueForKey:"isViewLoaded"];
+}
+
 /*!
     This method is called after the view controller has loaded its associated views into memory.
 
@@ -305,6 +315,79 @@ var CPViewControllerCachedCibs;
 
 }
 
+/*!
+    Called after the view controller’s view has been loaded into memory is about to be added to the
+    view hierarchy in the window.
+
+    @discussion You can override this method to perform tasks prior to a view controller’s view
+    getting added to view hierarchy, such as setting the view’s highlight color. This method is called when:
+
+        • The view is about to be added to the view hierarchy of the view controller
+
+    If you override this method, call this method on super at some point in your implementation in case
+    a superclass also overrides this method.
+
+    The default implementation of this method does nothing.
+*/
+- (void)viewWillAppear
+{
+
+}
+
+/*!
+    Called when the view controller’s view is fully transitioned onto the screen.
+
+    @discussion This method is called after the completion of any drawing and animations
+    involved in the initial appearance of the view. You can override this method to
+    perform tasks appropriate for that time, such as work that should not interfere
+    with the presentation animation, or starting an animation that you want to begin
+    after the view appears.
+
+    If you override this method, call this method on super at some point in your
+    implementation in case a superclass also overrides this method.
+
+    The default implementation of this method does nothing.
+*/
+- (void)viewDidAppear
+{
+
+}
+
+/*!
+    Called when the view controller’s view is about to be removed from the view hierarchy in the window.
+
+    @discussion You can override this method to perform tasks that are to precede the disappearance
+    of the view controller’s view, such as stopping a continuous animation that you
+    started in response to the viewDidAppear method call. This method is called when:
+
+        • The view is about to be removed from the view hierarchy of the window
+
+    If you override this method, call this method on super at some point in your
+    implementation in case a superclass also overrides this method.
+
+    The default implementation of this method does nothing.
+*/
+- (void)viewWillDisappear
+{
+
+}
+
+/*!
+    Called after the view controller’s view is removed from the view hierarchy in a window.
+
+    @discussion You can override this method to perform tasks associated with removing the view
+    controller’s view from the window’s view hierarchy, such as releasing resources
+    not needed when the view is not visible or no longer part of the window.
+
+    If you override this method, call this method on super at some point in your
+    implementation in case a superclass also overrides this method.
+
+    The default implementation of this method does nothing.
+*/
+- (void)viewDidDisappear
+{
+
+}
 
 /*!
     Manually sets the view that the controller manages.
@@ -318,6 +401,9 @@ var CPViewControllerCachedCibs;
 {
     var willChangeIsViewLoaded = (_isViewLoaded == NO && aView != nil) || (_isViewLoaded == YES && aView == nil);
 
+    [self _registerOrUnregister:NO notificationsForView:_view];
+    [self _registerOrUnregister:YES notificationsForView:aView];
+
     if (willChangeIsViewLoaded)
         [self willChangeValueForKey:"isViewLoaded"];
 
@@ -333,6 +419,30 @@ var CPViewControllerCachedCibs;
     return NO;
 }
 
+- (void)_registerOrUnregister:(BOOL)shouldRegister notificationsForView:(CPView)aView
+{
+    if (aView === nil)
+        return;
+
+    var center = [CPNotificationCenter defaultCenter],
+        notifs_to_sel = @{_CPViewWillAppearNotification : @"viewWillAppear",
+                          _CPViewDidAppearNotification : @"viewDidAppear",
+                          _CPViewWillDisappearNotification : @"viewWillDisappear",
+                          _CPViewDidDisappearNotification : @"viewDidDisappear"};
+
+    [notifs_to_sel enumerateKeysAndObjectsUsingBlock:function(notif, selString, stop)
+    {
+        var selector = CPSelectorFromString(selString);
+        if ([self implementsSelector:selector])
+        {
+            if (shouldRegister)
+                [center addObserver:self selector:selector name:notif object:aView];
+            else
+                [center removeObserver:self name:notif object:aView];
+        }
+    }];
+}
+
 @end
 
 

AppKit/CPWindow/CPWindow.j

@@ -308,7 +308,7 @@ CPTexturedBackgroundWindowMask
             [self setPlatformWindow:[CPPlatformWindow primaryPlatformWindow]];
         else
         {
-            // give zero sized borderless bridge windows a default size if we're not in the browser so they show up in NativeHost.
+            // give zero sized borderless bridge windows a default size.
             if ((aStyleMask & CPBorderlessBridgeWindowMask) && aContentRect.size.width === 0 && aContentRect.size.height === 0)
             {
                 var visibleFrame = [[[CPScreen alloc] init] visibleFrame];
@@ -655,7 +655,6 @@ CPTexturedBackgroundWindowMask
     CPBorderlessWindowMask
     CPTitledWindowMask
     CPClosableWindowMask
-    CPMiniaturizableWindowMask (NOTE: only available in NativeHost)
     CPResizableWindowMask
     CPTexturedBackgroundWindowMask
     CPBorderlessBridgeWindowMask
@@ -4099,6 +4098,9 @@ var interpolate = function(fromValue, toValue, progress)
             [overlappingTrackingAreas addObject:aTrackingArea];
     }
 
+    if (overlappingTrackingAreas.length === 0)
+        return;
+
     var frontmostTrackingArea = overlappingTrackingAreas[0],
         frontmostView         = [frontmostTrackingArea view];
 
@@ -4202,12 +4204,11 @@ var interpolate = function(fromValue, toValue, progress)
 {
     // This will put a tracking event in the _queuedTrackingEvents queue.
     //
-    // We optimize this queue with this policy :
+    // We optimize this queue with this policy:
     // - if mouseEntered, search if queue contains a previous mouseExited for the same tracking area. If so, discard both.
     // - if mouseExited, search if queue contains a previous mouseEntered for the same tracking area. If so, discard both.
     //
-    // This is not Cocoa way of doing as it would send every event.
-    // But final result should be the same.
+    // This is not the Cocoa way of doing as it would send every event, but the final result should be the same.
 
     var eventType    = [anEvent type],
         trackingArea = [anEvent trackingArea];

AppKit/CoreAnimation/CAAnimation.j

@@ -30,8 +30,10 @@
 */
 @implementation CAAnimation : CPObject
 {
-    BOOL    _isRemovedOnCompletion;
-    id      _delegate;
+    BOOL                    _isRemovedOnCompletion;
+    id                      _delegate;
+    CAMediaTimingFunction   _timingFunction @accessors(property=timingFunction);
+    double                  _duration @accessors(property=duration);
 }
 
 /*!
@@ -47,8 +49,10 @@
 {
     self = [super init];
 
-    if (self)
-        _isRemovedOnCompletion = YES;
+    _isRemovedOnCompletion = YES;
+    _timingFunction = nil;
+    _duration = 0.0;
+    _delegate = nil;
 
     return self;
 }
@@ -102,7 +106,7 @@
 - (CAMediaTimingFunction)timingFunction
 {
     // Linear Pacing
-    return nil;
+    return _timingFunction;
 }
 
 /*!
@@ -127,131 +131,4 @@
     [anObject addAnimation:self forKey:aKey];
 }
 
-@end
-
-/*
-
-*/
-@implementation CAPropertyAnimation : CAAnimation
-{
-    CPString    _keyPath;
-
-    BOOL        _isCumulative;
-    BOOL        _isAdditive;
-}
-
-+ (id)animationWithKeyPath:(CPString)aKeyPath
-{
-    var animation = [self animation];
-
-    [animation setKeyPath:aKeyPath];
-
-    return animation;
-}
-
-- (void)setKeyPath:(CPString)aKeyPath
-{
-    _keyPath = aKeyPath;
-}
-
-- (CPString)keyPath
-{
-    return _keyPath;
-}
-
-- (void)setCumulative:(BOOL)isCumulative
-{
-    _isCumulative = isCumulative;
-}
-
-- (BOOL)cumulative
-{
-    return _isCumulative;
-}
-
-- (BOOL)isCumulative
-{
-    return _isCumulative;
-}
-
-- (void)setAdditive:(BOOL)isAdditive
-{
-    _isAdditive = isAdditive;
-}
-
-- (BOOL)additive
-{
-    return _isAdditive;
-}
-
-- (BOOL)isAdditive
-{
-    return _isAdditive;
-}
-
-@end
-
-/*!
-    A CABasicAnimation is a simple animation that moves a
-    CALayer from one point to another over a specified
-    period of time.
-*/
-@implementation CABasicAnimation : CAPropertyAnimation
-{
-    id  _fromValue;
-    id  _toValue;
-    id  _byValue;
-}
-
-/*!
-    Sets the starting position for the animation.
-    @param aValue the animation starting position
-*/
-- (void)setFromValue:(id)aValue
-{
-    _fromValue = aValue;
-}
-
-/*!
-    Returns the animation's starting position.
-*/
-- (id)fromValue
-{
-    return _fromValue;
-}
-
-/*!
-    Sets the ending position for the animation.
-    @param aValue the animation ending position
-*/
-- (void)setToValue:(id)aValue
-{
-    _toValue = aValue;
-}
-
-/*!
-    Returns the animation's ending position.
-*/
-- (id)toValue
-{
-    return _toValue;
-}
-
-/*!
-    Sets the optional byValue for animation interpolation.
-    @param aValue the byValue
-*/
-- (void)setByValue:(id)aValue
-{
-    _byValue = aValue;
-}
-
-/*!
-    Returns the animation's byValue.
-*/
-- (id)byValue
-{
-    return _byValue;
-}
-
-@end
+@end

AppKit/CoreAnimation/CABasicAnimation.j

@@ -0,0 +1,84 @@
+@import <Foundation/CPObject.j>
+
+@import "CAPropertyAnimation.j"
+
+/*!
+    A CABasicAnimation is a simple animation that moves a
+    CALayer from one point to another over a specified
+    period of time.
+*/
+/*!
+    A CABasicAnimation is a simple animation that moves a
+    CALayer from one point to another over a specified
+    period of time.
+*/
+@implementation CABasicAnimation : CAPropertyAnimation
+{
+    id  _fromValue;
+    id  _toValue;
+    id  _byValue;
+}
+
+- (id)init
+{
+    self = [super init];
+
+    _fromValue = nil;
+    _toValue = nil;
+    _byValue = nil;
+
+    return self;
+}
+
+/*!
+    Sets the starting position for the animation.
+    @param aValue the animation starting position
+*/
+- (void)setFromValue:(id)aValue
+{
+    _fromValue = aValue;
+}
+
+/*!
+    Returns the animation's starting position.
+*/
+- (id)fromValue
+{
+    return _fromValue;
+}
+
+/*!
+    Sets the ending position for the animation.
+    @param aValue the animation ending position
+*/
+- (void)setToValue:(id)aValue
+{
+    _toValue = aValue;
+}
+
+/*!
+    Returns the animation's ending position.
+*/
+- (id)toValue
+{
+    return _toValue;
+}
+
+/*!
+    Sets the optional byValue for animation interpolation.
+    @param aValue the byValue
+*/
+- (void)setByValue:(id)aValue
+{
+    _byValue = aValue;
+}
+
+/*!
+    Returns the animation's byValue.
+*/
+- (id)byValue
+{
+    return _byValue;
+}
+
+@end

AppKit/CoreAnimation/CAKeyframeAnimation.j

@@ -0,0 +1,23 @@
+@import <Foundation/CPObject.j>
+
+@import "CAPropertyAnimation.j"
+
+@implementation CAKeyframeAnimation : CAPropertyAnimation
+{
+    CPArray _values   @accessors(property=values);
+    CPArray _keyTimes @accessors(property=keyTimes);
+    CPArray _timingFunctions @accessors(property=timingFunctions);
+}
+
+- (id)init
+{
+    self = [super init];
+
+    _values = [CPArray array];
+    _keyTimes = [CPArray array];
+    _timingFunctions = [CPArray array];
+
+    return self;
+}
+
+@end

AppKit/CoreAnimation/CAPropertyAnimation.j

@@ -0,0 +1,74 @@
+
+@import <Foundation/CPObject.j>
+
+@import "CAAnimation.j"
+
+@implementation CAPropertyAnimation : CAAnimation
+{
+    CPString    _keyPath;
+
+    BOOL        _isCumulative;
+    BOOL        _isAdditive;
+}
+
+- (id)init
+{
+    self = [super init];
+
+    _keyPath = nil;
+    _isCumulative = NO;
+    _isAdditive = NO;
+
+    return self;
+}
+
++ (id)animationWithKeyPath:(CPString)aKeyPath
+{
+    var animation = [self animation];
+
+    [animation setKeyPath:aKeyPath];
+
+    return animation;
+}
+
+- (void)setKeyPath:(CPString)aKeyPath
+{
+    _keyPath = aKeyPath;
+}
+
+- (CPString)keyPath
+{
+    return _keyPath;
+}
+
+- (void)setCumulative:(BOOL)isCumulative
+{
+    _isCumulative = isCumulative;
+}
+
+- (BOOL)cumulative
+{
+    return _isCumulative;
+}
+
+- (BOOL)isCumulative
+{
+    return _isCumulative;
+}
+
+- (void)setAdditive:(BOOL)isAdditive
+{
+    _isAdditive = isAdditive;
+}
+
+- (BOOL)additive
+{
+    return _isAdditive;
+}
+
+- (BOOL)isAdditive
+{
+    return _isAdditive;
+}
+
+@end

AppKit/CoreAnimation/CPAnimationContext.j

@@ -0,0 +1,532 @@
+@import "CABasicAnimation.j"
+@import "CAKeyframeAnimation.j"
+@import "CPView.j"
+
+@import <Foundation/CPTimer.j>
+@import <Foundation/CPRunLoop.j>
+
+@typedef Map;
+
+var _CPAnimationContextStack   = nil,
+    _animationFlushingObserver = nil;
+
+@implementation CPAnimationContext : CPObject
+{
+    double                  _duration               @accessors(property=duration);
+    CAMediaTimingFunction   _timingFunction         @accessors(property=timingFunction);
+    Function                _completionHandlerAgent;
+    Map                     _animationsByObject;
+}
+
++ (id)currentContext
+{
+    var contextStack = [self contextStack],
+        context = [contextStack lastObject];
+
+    if (!context)
+    {
+        context = [[CPAnimationContext alloc] init];
+
+        [contextStack addObject:context];
+        [self _scheduleAnimationContextStackFlush];
+    }
+
+    return context;
+}
+
++ (CPArray)contextStack
+{
+    if (!_CPAnimationContextStack)
+        _CPAnimationContextStack = [CPArray array];
+
+    return _CPAnimationContextStack;
+}
+
++ (void)runAnimationGroup:(Function/*(CPAnimationContext context)*/)animationsBlock completionHandler:(Function)aCompletionHandler
+{
+    [CPAnimationContext beginGrouping];
+
+    var context = [CPAnimationContext currentContext];
+    [context setCompletionHandler:aCompletionHandler];
+
+    animationsBlock(context);
+
+    [CPAnimationContext endGrouping];
+}
+
+- (id)init
+{
+    self = [super init];
+
+    _duration = 0.0;
+    _timingFunction = [CAMediaTimingFunction functionWithName:kCAMediaTimingFunctionLinear];
+    _completionHandlerAgent = nil;
+    _animationsByObject = new Map();
+
+    return self;
+}
+
+- (id)copy
+{
+    var context = [[CPAnimationContext alloc] init];
+    [context setDuration:[self duration]];
+    [context setTimingFunction:[self timingFunction]];
+    [context setCompletionHandler:[self completionHandler]];
+
+    return context;
+}
+
++ (void)_scheduleAnimationContextStackFlush
+{
+    if (!_animationFlushingObserver)
+    {
+#if (DEBUG)
+        CPLog.debug("create new observer");
+#endif
+        _animationFlushingObserver = CFRunLoopObserverCreate(2, true, 0, _animationFlushingObserverCallback, 0);
+        CFRunLoopAddObserver([CPRunLoop mainRunLoop], _animationFlushingObserver);
+    }
+}
+
++ (void)beginGrouping
+{
+    var newContext;
+
+    if ([_CPAnimationContextStack count])
+    {
+        var currentContext = [_CPAnimationContextStack lastObject];
+        newContext = [currentContext copy];
+    }
+    else
+    {
+        newContext = [[CPAnimationContext alloc] init];
+    }
+
+    [_CPAnimationContextStack addObject:newContext];
+}
+
++ (BOOL)endGrouping
+{
+    if (![_CPAnimationContextStack count])
+        return NO;
+
+    var context = [_CPAnimationContextStack lastObject];
+    [context _flushAnimations];
+    [_CPAnimationContextStack removeLastObject];
+
+#if (DEBUG)
+    CPLog.debug(_cmd + "context stack =" + _CPAnimationContextStack);
+#endif
+    return YES;
+}
+
+- (void)_enqueueActionForObject:(id)anObject keyPath:(id)aKeyPath targetValue:(id)aTargetValue animationCompletion:(id)animationCompletion
+{
+    var resolvedAction = [self _actionForObject:anObject keyPath:aKeyPath targetValue:aTargetValue animationCompletion:animationCompletion];
+
+    if (!resolvedAction)
+        return;
+
+    var animByKeyPath = _animationsByObject.get(anObject);
+
+    if (!animByKeyPath)
+    {
+        var newAnimByKeyPath = @{aKeyPath:resolvedAction};
+        _animationsByObject.set(anObject, newAnimByKeyPath);
+    }
+    else
+        [animByKeyPath setObject:resolvedAction forKey:aKeyPath];
+}
+
+- (Object)_actionForObject:(id)anObject keyPath:(CPString)aKeyPath targetValue:(id)aTargetValue animationCompletion:(Function)animationCompletion
+{
+    var animation,
+        duration,
+        animatedKeyPath,
+        values,
+        keyTimes,
+        timingFunctions,
+        needsPeriodicFrameUpdates,
+        objectId = [anObject UID];
+
+    if (!aKeyPath || !anObject || !(animation = [anObject animationForKey:aKeyPath]) || ![animation isKindOfClass:[CAAnimation class]])
+        return nil;
+
+    duration = [animation duration] || [self duration];
+    needsPeriodicFrameUpdates = [[anObject animator] needsPeriodicFrameUpdatesForKeyPath:aKeyPath];
+
+    if (_completionHandlerAgent)
+        _completionHandlerAgent.increment();
+
+    var animatorClass = [[anObject class] animatorClass];
+
+    var completionFunction = function()
+    {
+        if (needsPeriodicFrameUpdates)
+            [animatorClass stopUpdaterWithIdentifier:objectId];
+
+        if (animationCompletion)
+            animationCompletion();
+
+        if (needsPeriodicFrameUpdates || animationCompletion)
+            [[CPRunLoop currentRunLoop] performSelectors];
+
+        if (_completionHandlerAgent)
+            _completionHandlerAgent.decrement();
+    };
+
+    if (![animation isKindOfClass:[CAPropertyAnimation class]] || !(animatedKeyPath = [animation keyPath]))
+        animatedKeyPath = aKeyPath;
+
+    if ([animation isKindOfClass:[CAKeyframeAnimation class]])
+    {
+        values = [animation values];
+        keyTimes = [animation keyTimes];
+        timingFunctions = [animation timingFunctionsControlPoints];
+    }
+    else
+    {
+        var isBasicAnimation = [animation isKindOfClass:[CABasicAnimation class]],
+            fromValue,
+            toValue;
+
+        if (!isBasicAnimation || (fromValue = [animation fromValue]) == nil)
+            fromValue = [anObject valueForKey:animatedKeyPath];
+
+        if (!isBasicAnimation || (toValue = [animation toValue]) == nil)
+            toValue = aTargetValue;
+
+        values = [fromValue, toValue];
+        keyTimes = [0, 1];
+        timingFunctions = isBasicAnimation ? [animation timingFunctionControlPoints] : [_timingFunction controlPoints];
+    }
+
+    return {
+                object:anObject,
+                root:anObject,
+                keypath:animatedKeyPath,
+                values:values,
+                keytimes:keyTimes,
+                duration:duration,
+                timingfunctions:timingFunctions,
+                completion:completionFunction
+            };
+}
+
+- (void)_flushAnimations
+{
+    if (![_CPAnimationContextStack count])
+        return;
+
+    if (_animationsByObject.size == 0)
+    {
+        if (_completionHandlerAgent)
+            _completionHandlerAgent.fire();
+    }
+    else
+        [self _startAnimations];
+}
+
+- (void)_startAnimations
+{
+    var cssAnimations = [],
+        timers = [];
+
+    _animationsByObject.forEach(function(animByKeyPath, targetView)
+    {
+        [animByKeyPath enumerateKeysAndObjectsUsingBlock:function(aKey, anAction, stop)
+        {
+            [self getAnimations:cssAnimations getTimers:timers usingAction:anAction cssAnimate:YES];
+        }];
+    });
+
+    _animationsByObject.clear();
+
+// start timers
+    var k = timers.length;
+    while(k--)
+    {
+#if (DEBUG)
+        CPLog.debug("START TIMER " + timers[k].description());
+#endif
+        timers[k].start();
+    }
+
+// start css animations
+    var n = cssAnimations.length;
+    while(n--)
+    {
+#if (DEBUG)
+        CPLog.debug("START ANIMATION " + cssAnimations[n].description());
+#endif
+        cssAnimations[n].start();
+    }
+}
+
+- (void)getAnimations:(CPArray)cssAnimations getTimers:(CPArray)timers usingAction:(Object)anAction cssAnimate:(BOOL)needsCSSAnimation
+{
+    var values = anAction.values;
+
+    if (values.length == 2)
+    {
+        var start = values[0],
+            end = values[1];
+
+        if (anAction.keypath    == @"frame" && CGRectEqualToRect(start, end)
+            || anAction.keypath == @"frameSize" && CGSizeEqualToSize(start, end)
+            || anAction.keypath == @"frameOrigin" && CGPointEqualToPoint(start, end))
+            return;
+    }
+
+    var targetView                   = anAction.object,
+        keyPath                      = anAction.keypath,
+        isFrameKeyPath               = (keyPath == @"frame" || keyPath == @"frameSize"),
+        customLayout                 = [targetView hasCustomLayoutSubviews],
+        customDrawing                = [targetView hasCustomDrawRect],
+        declarative_subviews_layout  = (!customLayout || [targetView implementsSelector:@selector(frameRectOfView:inSuperviewSize:)]),
+        needsPeriodicFrameUpdates    = [[targetView animator] needsPeriodicFrameUpdatesForKeyPath:keyPath],
+        timer                        = nil,
+        animatorClass                = [[targetView class] animatorClass];
+
+    if (needsCSSAnimation)
+    {
+        [animatorClass addAnimations:cssAnimations forAction:anAction];
+    }
+
+    if (needsPeriodicFrameUpdates)
+    {
+        [animatorClass addFrameUpdaters:timers forAction:anAction];
+    }
+
+    var subviews = [targetView subviews],
+        count = [subviews count];
+
+    if (count && isFrameKeyPath)
+    {
+        [subviews enumerateObjectsUsingBlock:function(aSubview, idx, stop)
+        {
+            if (!declarative_subviews_layout && [aSubview autoresizingMask] == 0)
+                return;
+
+            var action = [self actionFromAction:anAction forAnimatedSubview:aSubview],
+                targetFrame = [action.values lastObject];
+
+            if (CGRectEqualToRect([aSubview frame], targetFrame))
+                return;
+
+            if ([aSubview hasCustomDrawRect])
+            {
+                action.completion = function()
+                {
+                    [aSubview setFrame:targetFrame];
+#if (DEBUG)
+                    CPLog.debug(aSubview + " setFrame: " + CPStringFromRect(targetFrame));
+#endif
+                    if (idx == count - 1)
+                        [animatorClass stopUpdaterWithIdentifier:[anAction.root UID]];
+                 };
+             }
+
+             var animate = !needsPeriodicFrameUpdates;
+             [self getAnimations:cssAnimations getTimers:timers usingAction:action cssAnimate:animate];
+         }];
+    }
+}
+
+- (Object)actionFromAction:(Object)anAction forAnimatedSubview:(CPView)aView
+{
+    var targetValue = [anAction.values lastObject],
+        startFrame = [aView frame],
+        endFrame,
+        values;
+
+    if (anAction.keypath == "frame")
+        targetValue = targetValue.size;
+
+    endFrame = [[aView superview] frameRectOfView:aView inSuperviewSize:targetValue];
+    values = [startFrame, endFrame];
+
+    return {
+                object:aView,
+                root:anAction.root,
+                keypath:"frame",
+                values:values,
+                keytimes:[0, 1],
+                duration:anAction.duration,
+                timingfunctions:anAction.timingfunctions
+            };
+}
+
+- (void)setCompletionHandler:(Function)aCompletionHandler
+{
+    if (_completionHandlerAgent)
+        _completionHandlerAgent.invalidate();
+
+    _completionHandlerAgent = aCompletionHandler ? (new CompletionHandlerAgent(aCompletionHandler)) : nil;
+}
+
+- (void)completionHandler
+{
+    if (!_completionHandlerAgent)
+        return nil;
+
+    return _completionHandlerAgent.completionHandler();
+}
+
+@end
+
+@implementation CPView (CPAnimationContext)
+
+- (CGRect)frameRectOfView:(CPView)aView inSuperviewSize:(CGSize)aSize
+{
+    return [aView frameWithNewSuperviewSize:aSize];
+}
+
+- (CGRect)frameWithNewSuperviewSize:(CGSize)newSize
+{
+    var mask = [self autoresizingMask];
+
+    if (mask == CPViewNotSizable)
+        return _frame;
+
+    var oldSize = _superview._frame.size,
+        newFrame = CGRectMakeCopy(_frame),
+        dX = newSize.width - oldSize.width,
+        dY = newSize.height - oldSize.height,
+        evenFractionX = 1.0 / ((mask & CPViewMinXMargin ? 1 : 0) + (mask & CPViewWidthSizable ? 1 : 0) + (mask & CPViewMaxXMargin ? 1 : 0)),
+        evenFractionY = 1.0 / ((mask & CPViewMinYMargin ? 1 : 0) + (mask & CPViewHeightSizable ? 1 : 0) + (mask & CPViewMaxYMargin ? 1 : 0)),
+        baseX = (mask & CPViewMinXMargin    ? _frame.origin.x : 0) +
+                (mask & CPViewWidthSizable  ? _frame.size.width : 0) +
+                (mask & CPViewMaxXMargin    ? oldSize.width - _frame.size.width - _frame.origin.x : 0),
+        baseY = (mask & CPViewMinYMargin    ? _frame.origin.y : 0) +
+                (mask & CPViewHeightSizable ? _frame.size.height : 0) +
+                (mask & CPViewMaxYMargin    ? oldSize.height - _frame.size.height - _frame.origin.y : 0);
+
+
+    if (mask & CPViewMinXMargin)
+        newFrame.origin.x += dX * (baseX > 0 ? _frame.origin.x / baseX : evenFractionX);
+    if (mask & CPViewWidthSizable)
+        newFrame.size.width += dX * (baseX > 0 ? _frame.size.width / baseX : evenFractionX);
+
+    if (mask & CPViewMinYMargin)
+        newFrame.origin.y += dY * (baseY > 0 ? _frame.origin.y / baseY : evenFractionY);
+    if (mask & CPViewHeightSizable)
+        newFrame.size.height += dY * (baseY > 0 ? _frame.size.height / baseY : evenFractionY);
+
+    return newFrame;
+}
+
+- (BOOL)hasCustomDrawRect
+{
+   return self._viewClassFlags & 1;
+}
+
+- (BOOL)hasCustomLayoutSubviews
+{
+   return self._viewClassFlags & 2;
+}
+
+@end
+
+@implementation CAMediaTimingFunction (Additions)
+
+- (CPArray)controlPoints
+{
+    return [_c1x, _c1y, _c2x, _c2y];
+}
+
+@end
+
+@implementation CAAnimation (Additions)
+
+- (CPArray)timingFunctionControlPoints
+{
+    if (_timingFunction)
+        return [_timingFunction controlPoints];
+
+    return [0, 0, 1, 1];
+}
+
+@end
+
+@implementation CAKeyframeAnimation (Additions)
+
+- (CPArray)timingFunctionsControlPoints
+{
+    var result = [CPArray array];
+
+    [_timingFunctions enumerateObjectsUsingBlock:function(timingFunction, idx)
+    {
+        [result addObject:[timingFunction controlPoints]];
+    }];
+
+    return result;
+}
+
+@end
+
+var CompletionHandlerAgent = function(aCompletionHandler)
+{
+    this._completionHandler = aCompletionHandler;
+    this.total = 0;
+    this.valid = true;
+};
+
+CompletionHandlerAgent.prototype.completionHandler = function()
+{
+    return this._completionHandler;
+};
+
+CompletionHandlerAgent.prototype.fire = function()
+{
+    this._completionHandler();
+};
+
+CompletionHandlerAgent.prototype.increment = function()
+{
+    this.total++;
+};
+
+CompletionHandlerAgent.prototype.decrement = function()
+{
+    if (this.total <= 0)
+        return;
+
+    this.total--;
+
+    if (this.valid && this.total == 0)
+    {
+        this.fire();
+    }
+};
+
+CompletionHandlerAgent.prototype.invalidate = function()
+{
+    this.valid = false;
+};
+
+var _animationFlushingObserverCallback = function()
+{
+#if (DEBUG)
+    CPLog.debug("_animationFlushingObserverCallback");
+#endif
+    if ([_CPAnimationContextStack count] == 1)
+    {
+        var context = [_CPAnimationContextStack lastObject];
+        [context _flushAnimations];
+        [_CPAnimationContextStack removeLastObject];
+    }
+
+#if (DEBUG)
+    CPLog.debug("_animationFlushingObserver "+_animationFlushingObserver+" stack:" + [_CPAnimationContextStack count]);
+#endif
+
+    if (_animationFlushingObserver && ![_CPAnimationContextStack count])
+    {
+#if (DEBUG)
+        CPLog.debug("removeObserver");
+#endif
+        CFRunLoopObserverInvalidate([CPRunLoop mainRunLoop], _animationFlushingObserver);
+        _animationFlushingObserver = nil;
+    }
+};

AppKit/CoreAnimation/CPViewAnimator.j

@@ -0,0 +1,435 @@
+
+@import "_CPObjectAnimator.j"
+@import "CPView.j"
+@import "CPCompatibility.j"
+@import "CSSAnimation.j"
+
+var DEFAULT_CSS_PROPERTIES = nil,
+    FRAME_UPDATERS = {};
+
+@implementation CPViewAnimator : _CPObjectAnimator
+{
+    BOOL    _wantsPeriodicFrameUpdates  @accessors(property=wantsPeriodicFrameUpdates);
+}
+
+- (id)initWithTarget:(id)aTarget
+{
+    self = [super initWithTarget:aTarget];
+
+    _wantsPeriodicFrameUpdates = NO;
+
+    return self;
+}
+
+- (void)removeFromSuperview
+{
+    [self _setTargetValue:nil withKeyPath:@"CPAnimationTriggerOrderOut" setter:_cmd];
+}
+
+- (void)setHidden:(BOOL)shouldHide
+{
+    if ([_target isHidden] == shouldHide)
+        return;
+
+    if (shouldHide == NO)
+        return [_target setHidden:NO];
+
+    [self _setTargetValue:YES withKeyPath:@"CPAnimationTriggerOrderOut" setter:_cmd];
+}
+
+- (void)setAlphaValue:(CGPoint)alphaValue
+{
+    [self _setTargetValue:alphaValue withKeyPath:@"alphaValue" setter:_cmd];
+}
+
+- (void)setBackgroundColor:(CPColor)aColor
+{
+    [self _setTargetValue:aColor withKeyPath:@"backgroundColor" setter:_cmd];
+}
+
+- (void)setFrameOrigin:(CGPoint)aFrameOrigin
+{
+    [self _setTargetValue:aFrameOrigin withKeyPath:@"frameOrigin" setter:_cmd];
+}
+
+- (void)setFrame:(CGRect)aFrame
+{
+    [self _setTargetValue:aFrame withKeyPath:@"frame" setter:_cmd];
+}
+
+- (void)setFrameSize:(CGSize)aFrameSize
+{
+    [self _setTargetValue:aFrameSize withKeyPath:@"frameSize" setter:_cmd];
+}
+
+// Convenience method for the common case where the setter has zero or one argument
+- (void)_setTargetValue:(id)aTargetValue withKeyPath:(CPString)aKeyPath setter:(SEL)aSelector
+{
+    var handler = function()
+    {
+        [_target _setForceUpdates:YES];
+        [_target performSelector:aSelector withObject:aTargetValue];
+        [_target _setForceUpdates:NO];
+    };
+
+    [self _setTargetValue:aTargetValue withKeyPath:aKeyPath fallback:handler completion:handler];
+}
+
+- (void)_setTargetValue:(id)aTargetValue withKeyPath:(CPString)aKeyPath fallback:(Function)fallback completion:(Function)completion
+{
+    var animation = [_target animationForKey:aKeyPath],
+        context = [CPAnimationContext currentContext];
+
+    if (!animation || ![animation isKindOfClass:[CAAnimation class]] || (![context duration] && ![animation duration]) || !CPFeatureIsCompatible(CPCSSAnimationFeature))
+    {
+        if (fallback)
+            fallback();
+    }
+    else
+    {
+        [context _enqueueActionForObject:_target keyPath:aKeyPath targetValue:aTargetValue animationCompletion:completion];
+    }
+}
+
++ (CPDictionary)_defaultCSSProperties
+{
+    if (DEFAULT_CSS_PROPERTIES == nil)
+    {
+        var transformProperty = "transform";
+
+        DEFAULT_CSS_PROPERTIES =  @{
+                                    "backgroundColor"  : [@{"property":"background", "value":function(sv, val){return [val cssString];}}],
+                                    "alphaValue"       : [@{"property":"opacity"}],
+                                    "frame"            : [@{"property":transformProperty, "value":frameToCSSTranslationTransformMatrix},
+                                                          @{"property":"width", "value":transformFrameToWidth},
+                                                          @{"property":"height", "value":transformFrameToHeight}],
+                                    "frameOrigin"      : [@{"property":transformProperty, "value":frameOriginToCSSTransformMatrix}],
+                                    "frameSize"        : [@{"property":"width", "value":transformSizeToWidth},
+                                                          @{"property":"height", "value":transformSizeToHeight}]
+                                    };
+    }
+
+    return DEFAULT_CSS_PROPERTIES;
+}
+
++ (void)addAnimations:(CPArray)animations forAction:(id)anAction
+{
+    var target = anAction.object;
+
+    return [self _addAnimations:animations forAction:anAction domElement:[target _DOMElement] identifier:[target UID]];
+}
+
++ (void)_addAnimations:(CPArray)animations forAction:(id)anAction domElement:(Object)aDomElement identifier:(CPString)anIdentifier
+{
+    var animation = [animations objectPassingTest:function(anim, idx, stop)
+    {
+        return anim.identifier == anIdentifier;
+    }];
+
+    if (animation == nil)
+    {
+        animation = new CSSAnimation(aDomElement, anIdentifier, [anAction.object debug_description]);
+        [animations addObject:animation];
+    }
+
+    var css_mapping = [self _cssPropertiesForKeyPath:anAction.keypath];
+
+    [css_mapping enumerateObjectsUsingBlock:function(aDict, anIndex, stop)
+    {
+        var completionFunction = (anIndex == 0) ? anAction.completion : null,
+            property = [aDict objectForKey:@"property"],
+            getter = [aDict objectForKey:@"value"];
+
+        animation.addPropertyAnimation(property, getter, anAction.duration, anAction.keytimes, anAction.values, anAction.timingfunctions, completionFunction);
+    }];
+}
+
++ (CPArray)_cssPropertiesForKeyPath:(CPString)aKeyPath
+{
+    return [[self _defaultCSSProperties] objectForKey:aKeyPath];
+}
+
++ (void)addFrameUpdaters:(CPArray)frameUpdaters forAction:(id)anAction
+{
+    var rootIdentifier = [anAction.root UID];
+
+    var frameUpdater = [frameUpdaters objectPassingTest:function(updater, idx, stop)
+    {
+        // There is one timer, linked to the top view, that updates the whole hierarchy.
+        return updater.identifier() == rootIdentifier;
+    }];
+
+    if (frameUpdater == nil)
+    {
+        frameUpdater = new FrameUpdater(rootIdentifier);
+        [frameUpdaters addObject:frameUpdater];
+        FRAME_UPDATERS[rootIdentifier] = frameUpdater;
+    }
+
+    frameUpdater.addTarget(anAction.object, anAction.keypath, anAction.duration);
+}
+
++ (void)stopUpdaterWithIdentifier:(CPString)anIdentifier
+{
+    var frameUpdater = FRAME_UPDATERS[anIdentifier];
+
+    if (frameUpdater)
+    {
+        frameUpdater.stop();
+        delete FRAME_UPDATERS[anIdentifier];
+    }
+    else
+        CPLog.warn("Could not find FrameUpdater with identifier " + anIdentifier);
+}
+
+- (BOOL)needsPeriodicFrameUpdatesForKeyPath:(CPString)aKeyPath
+{
+    return ((aKeyPath == @"frame" || aKeyPath == @"frameSize") &&
+            (([_target hasCustomLayoutSubviews] && ![_target implementsSelector:@selector(frameRectOfView:inSuperviewSize:)])
+             || [_target hasCustomDrawRect]))
+            || [self wantsPeriodicFrameUpdates];
+}
+
+@end
+
+var transformFrameToWidth = function(start, current)
+{
+    return current.size.width + "px";
+};
+
+var transformFrameToHeight = function(start, current)
+{
+    return current.size.height + "px";
+};
+
+var transformSizeToWidth = function(start, current)
+{
+    return current.width + "px";
+};
+
+var transformSizeToHeight = function(start, current)
+{
+    return current.height + "px";
+};
+
+var CSSStringFromCGAffineTransform = function(anAffineTransform)
+{
+    return "matrix(" + anAffineTransform.a + ", " + anAffineTransform.b + ", " + anAffineTransform.c + ", " + anAffineTransform.d + ", " + anAffineTransform.tx + (CPBrowserIsEngine(CPGeckoBrowserEngine) ? "px, " : ", ") + anAffineTransform.ty + (CPBrowserIsEngine(CPGeckoBrowserEngine) ? "px)" : ")");
+};
+
+var frameOriginToCSSTransformMatrix = function(start, current)
+{
+    var affine = CGAffineTransformMakeTranslation(current.x - start.x, current.y - start.y);
+
+    return CSSStringFromCGAffineTransform(affine);
+};
+
+var frameToCSSTranslationTransformMatrix = function(start, current)
+{
+    var affine = CGAffineTransformMakeTranslation(current.origin.x - start.origin.x, current.origin.y - start.origin.y);
+
+    return CSSStringFromCGAffineTransform(affine);
+};
+
+@implementation CPView (CPAnimatablePropertyContainer)
+
++ (Class)animatorClass
+{
+    var anim_class = CPClassFromString(CPStringFromClass(self) + "Animator");
+
+    if (anim_class)
+        return anim_class;
+
+    return [[self superclass] animatorClass];
+}
+
+- (id)animator
+{
+    if (!_animator)
+        _animator = [[[[self class] animatorClass] alloc] initWithTarget:self];
+
+    return _animator;
+}
+
++ (CAAnimation)defaultAnimationForKey:(CPString)aKey
+{
+    // TODO: remove when supported.
+    if (aKey == @"CPAnimationTriggerOrderIn")
+    {
+        CPLog.warn("CPView animated key path CPAnimationTriggerOrderIn is not supported yet.");
+        return nil;
+    }
+
+    if ([[self animatorClass] _cssPropertiesForKeyPath:aKey] !== nil)
+        return [CAAnimation animation];
+
+    return nil;
+}
+
+- (CAAnimation)animationForKey:(CPString)aKey
+{
+    var animations = [self animations],
+        animation = nil;
+
+    if (!animations || !(animation = [animations objectForKey:aKey]))
+    {
+        animation = [[self class] defaultAnimationForKey:aKey];
+    }
+
+    return animation;
+}
+
+- (CPDictionary)animations
+{
+    return _animationsDictionary;
+}
+
+- (void)setAnimations:(CPDictionary)animationsDict
+{
+    _animationsDictionary = [animationsDict copy];
+}
+
+- (Object)_DOMElement
+{
+    return _DOMElement;
+}
+
+- (CPString)debug_description
+{
+    return [self identifier] || [self className];
+}
+
+@end
+
+@implementation CPArray (Additions)
+
+- (CPArray)objectPassingTest:(Function)aFunction
+{
+    var idx = [self indexOfObjectPassingTest:aFunction];
+
+    if (idx !== CPNotFound)
+        return [self objectAtIndex:idx];
+
+    return nil;
+}
+@end
+
+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;
+
+        for (var i = 0; i < frameUpdater._callbacks.length; i++)
+            frameUpdater._callbacks[i]();
+
+        if (timestamp - frameUpdater._startDate < frameUpdater._duration * 1000)
+            window.requestAnimationFrame(frameUpdater._updateFunction);
+    };
+};
+
+FrameUpdater.prototype.start = function()
+{
+    this._requestId = window.requestAnimationFrame(this._updateFunction);
+};
+
+FrameUpdater.prototype.stop = function()
+{
+    CPLog.warn("STOP FrameUpdater" + 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;
+};
+
+FrameUpdater.prototype.updateFunction = function()
+{
+    return this._updateFunction;
+};
+
+FrameUpdater.prototype.identifier = function()
+{
+    return this._identifier;
+};
+
+FrameUpdater.prototype.description = function()
+{
+    return "<timer " + this._identifier + " " + this._targets.map(function(t){return [t debug_description];}) + ">";
+};
+
+FrameUpdater.prototype.addTarget = function(target, keyPath, duration)
+{
+    var callback = createUpdateFrame(target, keyPath);
+
+    if (callback)
+    {
+        this._duration = MAX(this._duration, duration);
+        this._targets.push(target);
+        this._callbacks.push(callback);
+    }
+};
+
+var createUpdateFrame = function(aView, aKeyPath)
+{
+    if (aKeyPath !== "frame" && aKeyPath !== "frameSize" && aKeyPath !== "frameOrigin")
+        return nil;
+
+    var style = getComputedStyle([aView _DOMElement]),
+        getCSSPropertyValue = function(prop) {
+            return ROUND(parseFloat(style.getPropertyValue(prop)));
+        },
+        initialOrigin     = CGPointMakeCopy([aView frameOrigin]),
+        transformProperty = CPBrowserStyleProperty("transform"),
+        updateFrame       = function(timestamp)
+        {
+                if (aKeyPath === "frameSize")
+                {
+                    var width  = getCSSPropertyValue("width"),
+                        height = getCSSPropertyValue("height");
+
+                    [aView setFrameSize:CGSizeMake(width, height)];
+                }
+                else
+                {
+                    [aView _setInhibitDOMUpdates:YES];
+
+                    var matrix = style[transformProperty].split('(')[1].split(')')[0].split(','),
+                             x = ROUND(initialOrigin.x + parseFloat(matrix[4])),
+                             y = ROUND(initialOrigin.y + parseFloat(matrix[5]));
+
+                    if (aKeyPath === "frame")
+                    {
+                        var width  = getCSSPropertyValue("width"),
+                            height = getCSSPropertyValue("height");
+
+                        [aView setFrame:CGRectMake(x, y, width, height)];
+                    }
+                    else
+                    {
+                        [aView setFrameOrigin:CGPointMake(x, y)];
+                    }
+
+                    [aView _setInhibitDOMUpdates:NO];
+                }
+
+            [[CPRunLoop currentRunLoop] performSelectors];
+    //        CPLog.debug("update " + [aView debug_description]);
+        };
+
+    return updateFrame;
+};

AppKit/CoreAnimation/CSSAnimation.j

@@ -0,0 +1,308 @@
+
+var ANIMATIONS_GLOBAL_ID = 0,
+    CURRENT_ANIMATIONS = {},
+
+    ANIMATION_END_EVENT_NAME,
+    ANIMATION_PROPERTY,
+    ANIMATION_NAME_PROPERTY,
+    ANIMATION_DURATION_PROPERTY,
+    ANIMATION_TIMING_FUNCTION_PROPERTY,
+    ANIMATION_FILL_MODE_PROPERTY,
+    ANIMATION_KEYFRAMES_RULE;
+
+var defineCSSProperties = function()
+{
+    if (this.done)
+        return;
+
+    ANIMATION_END_EVENT_NAME           = CPBrowserStyleProperty("animationend");
+    ANIMATION_PROPERTY                 = CPBrowserCSSProperty("animation");
+    ANIMATION_NAME_PROPERTY            = CPBrowserCSSProperty("animation-name");
+    ANIMATION_DURATION_PROPERTY        = CPBrowserCSSProperty("animation-duration");
+    ANIMATION_TIMING_FUNCTION_PROPERTY = CPBrowserCSSProperty("animation-timing-function");
+    ANIMATION_FILL_MODE_PROPERTY       = CPBrowserCSSProperty("animation-fill-mode");
+    ANIMATION_KEYFRAMES_RULE           = "@" + ANIMATION_PROPERTY.substring(0, ANIMATION_PROPERTY.indexOf("animation")) + "keyframes";
+
+    this.done = true;
+};
+
+var removeFromParent = function(aNode)
+{
+    var parentNode = aNode.parentNode;
+
+    if (parentNode)
+        parentNode.removeChild(aNode);
+};
+
+CSSAnimation = function(aTarget/* DOM Element */, anIdentifier, aTargetName)
+{
+    defineCSSProperties();
+
+    if (!anIdentifier)
+        anIdentifier = ANIMATIONS_GLOBAL_ID++;
+
+    var animationName = "anim_" + anIdentifier,
+        animation = CURRENT_ANIMATIONS[anIdentifier];
+
+    if (animation)
+    {
+        console.warn("Animation " + anIdentifier + " is already in use. Ignoring.");
+    }
+    else
+    {
+        this.target = aTarget;
+        this.identifier = anIdentifier;
+        this.targetName = aTargetName;
+        this.animationName = animationName;
+        this.listener = null;
+        this.styleElement = null;
+        this.propertyanimations = [];
+        this.animationsnames = [];
+        this.animationstimingfunctions = [];
+        this.animationsdurations = [];
+        this.islive = false;
+        this.didBuildDOMElements = false;
+
+        animation = this;
+        CURRENT_ANIMATIONS[anIdentifier] = animation;
+    }
+
+    return animation;
+};
+
+CSSAnimation.prototype.description = function()
+{
+    return "<animation " + this.identifier + " target=" + this.targetName + " properties=" + this.propertyanimations.map(function(anim){return anim.property;}).join(",") + " >";
+}
+
+CSSAnimation.prototype.addPropertyAnimation = function(propertyName/* String */, valueFunction/* Function */, aDuration/* float */, aKeyTimes/* (d, [d]) */, aValues/* Array */, aTimingFunctions/* [d,d,d,d], [[d,d,d,d]] */, aCompletionfunction/* Function */)
+{
+    if (this.islive)
+        return false;
+// TODO: If a property already exist, replace its values & valueFunctions.
+
+    var fullAnimationName = this.animationName + "_" + propertyName;
+
+    var animation = {
+        name: fullAnimationName,
+        property: propertyName,
+        valuefunction: valueFunction,
+        keytimes: aKeyTimes,
+        values: aValues,
+        duration: aDuration,
+        completionfunction: aCompletionfunction };
+
+    var animationTimingFunction;
+
+    if (aTimingFunctions && (aTimingFunctions[0] instanceof Array))
+    {
+        animation.keyframestimingFunctions = aTimingFunctions;
+        // dummy timing function overriden by keyframes timings functions
+        animationTimingFunction = "linear";
+    }
+    else
+    {
+        animationTimingFunction = "cubic-bezier(" + aTimingFunctions + ")";
+    }
+
+    this.animationstimingfunctions.push(animationTimingFunction);
+
+    this.propertyanimations.push(animation);
+    this.animationsnames.push(fullAnimationName);
+    this.animationsdurations.push(aDuration + "s");
+
+    return true;
+};
+
+CSSAnimation.prototype.keyFrames = function()
+{
+    var keyframesRules = [];
+
+    var count = this.propertyanimations.length;
+
+    for (var i = 0; i < count; i++)
+    {
+        var animation = this.propertyanimations[i],
+            property = animation.property,
+            valuefunction = animation.valuefunction,
+            keytimes = animation.keytimes,
+            values = animation.values,
+            timingFunctions = animation.keyframestimingFunctions;
+
+        var keyframes = [],
+            keytimescount = keytimes.length,
+            start_value = values[0];
+
+        for (var j = 0; j < keytimescount; j++)
+        {
+            var keytime = keytimes[j],
+                value = values[j],
+                timingFunction;
+
+            if (valuefunction !== null)
+                value = valuefunction(start_value, value);
+
+            var keyframeContent = property + ": " + value + ";";
+
+            if (timingFunctions && timingFunctions.length && (timingFunction = timingFunctions[j]))
+            {
+                keyframeContent += ANIMATION_TIMING_FUNCTION_PROPERTY + ":cubic-bezier(" + timingFunction + ");";
+            }
+
+            var keyframe = "\t" + Math.round(keytime * 100) + "% {\n\t\t" + keyframeContent + "\n\t}\n";
+
+            keyframes.push(keyframe);
+        }
+        // TODO ! Add keyframe rule to CPCompatibility
+        var rule = ANIMATION_KEYFRAMES_RULE + " " + animation.name + " {\n" + keyframes.join(" ") + "}\n";
+
+        keyframesRules.push(rule);
+    }
+
+    return keyframesRules.join("\n");
+};
+
+CSSAnimation.prototype.appendKeyFramesRule = function()
+{
+    var styleElement = this.createKeyFramesStyleElement(),
+        keyframesText = this.keyFrames(),
+        nodeText = document.createTextNode(keyframesText);
+
+    styleElement.appendChild(nodeText);
+    document.head.appendChild(styleElement);
+};
+
+CSSAnimation.prototype.createKeyFramesStyleElement = function()
+{
+    if (!this.styleElement)
+    {
+        var styleElement = document.createElement("style");
+
+        styleElement.setAttribute("type", "text/css");
+
+        this.styleElement = styleElement;
+    }
+
+    return this.styleElement;
+};
+
+CSSAnimation.prototype.endEventListener = function()
+{
+    var animation = this,
+        animationsNames = this.animationsnames,
+        inFlightAnimationsNames = animationsNames.slice();
+
+    if (!animation.listener)
+    {
+        var AnimationEndListener = function(event)
+        {
+            var idx = inFlightAnimationsNames.indexOf(event.animationName);
+
+            if (idx !== -1)
+                inFlightAnimationsNames.splice(idx, 1);
+
+            if (inFlightAnimationsNames.length > 0)
+                return;
+
+            for (var i = 0; i < animationsNames.length; i++)
+            {
+                var completion = animation.completionFunctionForAnimationName(animationsNames[i]);
+
+                if (completion)
+                    completion();
+            }
+
+            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");
+
+                if (animation.animationstimingfunctions.length)
+                    style.removeProperty(ANIMATION_TIMING_FUNCTION_PROPERTY);
+
+                removeFromParent(animation.styleElement);
+
+                eventTarget.removeEventListener(ANIMATION_END_EVENT_NAME, AnimationEndListener);
+                animation.listener = null;
+                delete (CURRENT_ANIMATIONS[animation.identifier]);
+            }
+            catch (err)
+            {
+                console.warn("CSSAnimation.j - " + err);
+            }
+        };
+
+        this.listener = AnimationEndListener;
+    }
+
+    return this.listener;
+};
+
+CSSAnimation.prototype.completionFunctionForAnimationName = function(aName)
+{
+    var propanims = this.propertyanimations,
+        count = propanims.length;
+
+    while (count--)
+    {
+        var anim = propanims[count];
+
+        if (anim.name === aName)
+            return anim.completionfunction;
+    }
+
+    return null;
+};
+
+CSSAnimation.prototype.addAnimationEndEventListener = function()
+{
+    var listener = this.endEventListener();
+
+    this.target.addEventListener(ANIMATION_END_EVENT_NAME, listener, false);
+};
+
+CSSAnimation.prototype.setTargetStyleProperties = function()
+{
+    var style = this.target.style;
+
+    if (this.animationstimingfunctions.length)
+        style.setProperty(ANIMATION_TIMING_FUNCTION_PROPERTY, this.animationstimingfunctions.join(","));
+
+    style.setProperty(ANIMATION_DURATION_PROPERTY, this.animationsdurations.join(","));
+
+    style.setProperty(ANIMATION_FILL_MODE_PROPERTY, "forwards");
+
+//    http://webdesign.tutsplus.com/tutorials/htmlcss-tutorials/css3-animations-the-hiccups-and-bugs-youll-want-to-avoid/
+    style.setProperty("-webkit-backface-visibility", "hidden");
+};
+
+CSSAnimation.prototype.buildDOMElements = function()
+{
+    this.appendKeyFramesRule();
+
+    this.addAnimationEndEventListener();
+
+    this.setTargetStyleProperties();
+
+    this.didBuildDOMElements = true;
+};
+
+CSSAnimation.prototype.start = function()
+{
+    if (this.propertyanimations.length === 0 || this.islive)
+        return false;
+
+    if (!this.didBuildDOMElements)
+        this.buildDOMElements();
+
+    this.target.style.setProperty(ANIMATION_NAME_PROPERTY, this.animationsnames.join(","));
+
+    this.islive = true;
+
+    return true;
+};

AppKit/CoreAnimation/_CPObjectAnimator.j

@@ -0,0 +1,92 @@
+
+@import <Foundation/CPProxy.j>
+@import "CPAnimationContext.j"
+
+var _supportsCSSAnimations = null;
+
+@protocol CPAnimatablePropertyContainer <CPObject>
+
++ (id)defaultAnimationForKey:(CPString)key;
+- (id)animationForKey:(CPString)key;
+
+- (id)animator;
+- (CPDictionary)animations;
+- (void)setAnimations:(CPDictionary)animations;
+
+@end
+
+@implementation _CPObjectAnimator : CPProxy
+{
+    id <CPAnimatablePropertyContainer> _target;
+}
+
++ (BOOL)initialize
+{
+    if ([self class] !== [_CPObjectAnimator class])
+        return;
+
+    var compat = (CPBrowserCSSProperty("animation") !== nil);
+    CPSetPlatformFeature(CPCSSAnimationFeature, compat);
+}
+
+- (id)initWithTarget:(id)aTarget
+{
+    _target = aTarget;
+
+    return self;
+}
+
+- (id)animator
+{
+    return self;
+}
+
+- (BOOL)isEqual:(id)anObject
+{
+   return [_target isEqual:anObject];
+}
+
+- (id)forwardingTargetForSelector:(SEL)aSelector
+{
+    return _target;
+}
+
+- (CPMethodSignature)methodSignatureForSelector:(SEL)aSelector
+{
+    return [_target methodSignatureForSelector:aSelector];
+}
+
+- (void)forwardInvocation:(CPInvocation)anInvocation
+{
+    var target = [self forwardingTargetForSelector:[anInvocation selector]];
+    [anInvocation invokeWithTarget:target];
+    return;
+}
+
+- (void)doesNotRecognizeSelector:(SEL)aSelector
+{
+    [CPException raise:CPInvalidArgumentException reason:@"Animator does not recognize selector " + CPStringFromSelector(aSelector)];
+}
+
+- (CPString)description
+{
+    return [CPString stringWithFormat:@"%@ Animator Proxy for %@", [self class], _target];
+}
+
+- (void)setValue:(id)aTargetValue forKey:(id)aKeyPath
+{
+    var animation = [_target animationForKey:aKeyPath],
+        context = [CPAnimationContext currentContext];
+
+    if (!animation || ![animation isKindOfClass:[CAAnimation class]] || (![context duration] && ![animation duration]) || !CPFeatureIsCompatible(CPCSSAnimationFeature))
+        [_target setValue:aTargetValue forKey:aKeyPath];
+    else
+    {
+        [context _enqueueActionForObject:_target keyPath:aKeyPath targetValue:aTargetValue animationCompletion:function()
+        {
+            [_target setValue:aTargetValue forKey:aKeyPath];
+        }];
+    }
+}
+
+@end

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/CPPlatformWindow.j

@@ -60,6 +60,7 @@ var PrimaryPlatformWindow   = NULL;
 
     BOOL                    _mouseIsDown;
     BOOL                    _mouseDownIsRightClick;
+    int                     _firstMouseDownButton;
     CGPoint                 _lastMouseEventLocation;
     CPWindow                _mouseDownWindow;
     CPTimeInterval          _lastMouseUp;

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/Platform/DOM/CPPlatformWindow+DOM.j

@@ -952,8 +952,8 @@ _CPPlatformWindowWillCloseNotification = @"_CPPlatformWindowWillCloseNotificatio
                                   timestamp:timestamp windowNumber:windowNumber context:nil eventNumber:-1 clickCount:1 pressure:0];
     event._DOMEvent = aDOMEvent;
 
-    // We lag 1 event behind without this timeout.
-    setTimeout(function()
+    // We lag 1 event behind without this approach
+    window.requestAnimationFrame(function()
     {
         if (aDOMEvent.deltaMode !== undefined && aDOMEvent.deltaMode !== 0)
         {
@@ -992,10 +992,10 @@ _CPPlatformWindowWillCloseNotification = @"_CPPlatformWindowWillCloseNotificatio
         _DOMScrollingElement.scrollLeft = 150;
         _DOMScrollingElement.scrollTop = 150;
 
-        // Is this needed?
-        //[[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
+        // this is needed to prevent flickering during scrolling
+        [[CPRunLoop currentRunLoop] limitDateForMode:CPDefaultRunLoopMode];
 
-    }, 0);
+    });
 
     // We hide the dom element after a little bit
     // so that other DOM elements such as inputs
@@ -1171,7 +1171,11 @@ _CPPlatformWindowWillCloseNotification = @"_CPPlatformWindowWillCloseNotificatio
         var touch = aDOMEvent.touches.length ? aDOMEvent.touches[0] : aDOMEvent.changedTouches[0];
 
         newEvent.clientX = touch.clientX;
-        newEvent.clientY = touch.clientY;
+
+        /*
+        Normally the document can't scroll in Cappuccino: our body element has top:0 and bottom:0 with absolute positioning. So it should always be exactly the height of the viewport. The below handles a special case. iOS scrolls the document when the virtual keyboard is present and it needs to move a text input upwards visually to avoid covering the input with the keyboard. For most purposes we can ignore this, except here. In theory I think we could always apply this (scrollTop should always be 0 on every other device and situation) but let's be defensive and only apply it for touch events to minimise the risk of surprises.
+        */
+        newEvent.clientY = _DOMWindow.document.body.scrollTop + touch.clientY;
 
         newEvent.timestamp = [CPEvent currentTimestamp];
         newEvent.target = aDOMEvent.target;
@@ -1245,12 +1249,16 @@ _CPPlatformWindowWillCloseNotification = @"_CPPlatformWindowWillCloseNotificatio
     {
         if (_mouseIsDown)
         {
+            if (aDOMEvent.button !== _firstMouseDownButton)
+                return;
+
             event = _CPEventFromNativeMouseEvent(aDOMEvent, _mouseDownIsRightClick ? CPRightMouseUp : CPLeftMouseUp, location, modifierFlags, timestamp, windowNumber, nil, -1, CPDOMEventGetClickCount(_lastMouseUp, timestamp, location), 0, nil);
 
             _mouseIsDown = NO;
             _lastMouseUp = event;
             _mouseDownWindow = nil;
             _mouseDownIsRightClick = NO;
+            _firstMouseDownButton = -1;
         }
 
         if (_DOMEventMode)
@@ -1270,6 +1278,16 @@ _CPPlatformWindowWillCloseNotification = @"_CPPlatformWindowWillCloseNotificatio
 
         _mouseDownIsRightClick = button == 2 || (CPBrowserIsOperatingSystem(CPMacOperatingSystem) && button == 0 && modifierFlags & CPControlKeyMask);
 
+        // If mouse is already down, that means that a second mouse button is pushed. This could interfere in mouse events treatment. Just ignore it.
+        // BUT we have to track which button will be first released.
+        if (_mouseIsDown)
+        {
+            _mouseDownIsRightClick = !_mouseDownIsRightClick;
+            return;
+        }
+
+        _firstMouseDownButton = button;
+
         if ((sourceElement.tagName === "INPUT" || sourceElement.tagName === "TEXTAREA") && sourceElement != _DOMFocusElement)
         {
             if ([CPPlatform supportsDragAndDrop])

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];

AppKit/_CPImageAndTextView.j

@@ -66,6 +66,7 @@ var _CPimageAndTextViewFrameSizeChangedFlag         = 1 << 0,
     CPString                _text;
 
     CGSize                  _textSize;
+    BOOL                    _usesSingleLineMode @accessors;
 
     unsigned                _flags;
 
@@ -107,6 +108,8 @@ var _CPimageAndTextViewFrameSizeChangedFlag         = 1 << 0,
         }
 
         _textSize = nil;
+        _usesSingleLineMode = NO;
+
         [self setHitTests:NO];
     }
 
@@ -550,14 +553,16 @@ var _CPimageAndTextViewFrameSizeChangedFlag         = 1 << 0,
                 case CPLineBreakByCharWrapping:
                 case CPLineBreakByWordWrapping:
                     textStyle.wordWrap = "break-word";
-                    try {
+                    try
+                    {
                         textStyle.whiteSpace = "pre";
                         textStyle.whiteSpace = "-o-pre-wrap";
                         textStyle.whiteSpace = "-pre-wrap";
                         textStyle.whiteSpace = "-moz-pre-wrap";
                         textStyle.whiteSpace = "pre-wrap";
                     }
-                    catch (e) {
+                    catch (e)
+                    {
                         //internet explorer doesn't like these properties
                         textStyle.whiteSpace = "pre";
                     }
@@ -723,6 +728,9 @@ var _CPimageAndTextViewFrameSizeChangedFlag         = 1 << 0,
                         _lineBreakMode === CPLineBreakByWordWrapping)
                     {
                         _textSize = [_text sizeWithFont:_font inWidth:textRectWidth];
+
+                        if (_usesSingleLineMode)
+                            _textSize.height = [_font defaultLineHeightForFont];
                     }
                     else
                     {

CommonJS/lib/cappuccino/nativehost.js

@@ -1,70 +0,0 @@
-var FILE = require("file");
-var OS = require("os");
-
-var NATIVEHOST_SOURCE = FILE.path(module.path).dirname().dirname().dirname().join("support", "NativeHost.app");
-
-exports.buildNativeHost = function(rootPath, buildNative, options) {
-    options = options || {};
-    options.index = options.index || "index.html";
-
-    rootPath = FILE.path(rootPath);
-    buildNative = FILE.path(buildNative);
-
-    if (buildNative.exists())
-        buildNative.rmtree();
-
-    buildNative.dirname().mkdirs();
-    // FIXME: Narwhal doesn't preserve permissions
-    // FILE.copyTree(NATIVEHOST_SOURCE, buildNative);
-    OS.system(["cp", "-r", NATIVEHOST_SOURCE, buildNative]);
-    FILE.chmod(buildNative.join("Contents", "MacOS", "NativeHost"), 0755);
-
-    var rootBaseName = rootPath.basename();
-    var buildClientDirectory = buildNative.join("Contents", "Resources", rootBaseName);
-
-    FILE.mkdirs(FILE.dirname(buildClientDirectory));
-    // FILE.copyTree(rootPath, buildClientDirectory);
-    OS.system(["cp", "-r", rootPath, buildClientDirectory]);
-
-    var defaultBundleName = buildNative.basename().match(/^(.*)(\.app)?$/)[1];
-
-    function mergePlist(plist, path) {
-        var otherPlist = CFPropertyList.readPropertyListFromFile(String(path));
-
-        otherPlist.keys().forEach(function(key) {
-            var value = otherPlist.valueForKey(key);
-            plist.setValueForKey(key, value);
-
-            if (key === "CPBundleName")
-                plist.setValueForKey("CFBundleName", value);
-
-            if (key === "CFBundleIconFile") {
-                var iconPath = rootPath.join("Resources", value);
-                if (iconPath.isFile())
-                    iconPath.copy(buildNative.join("Contents", "Resources", value));
-                else
-                    print("Warning: CFBundleIconFile references " + value + " but does not exist in the resources directory.");
-            }
-
-            if (key === "CFBundleExecutable") {
-                buildNative.join("Contents", "MacOS", "NativeHost").rename(value);
-                // FIXME:
-                FILE.chmod(buildNative.join("Contents", "MacOS", value), 0755);
-            }
-        });
-    }
-
-    CFPropertyList.modifyPlist(buildNative.join("Contents", "Info.plist"), function(plist) {
-
-        plist.setValueForKey("CFBundleName", defaultBundleName);
-        plist.setValueForKey("NHInitialResource", FILE.join(rootBaseName, options.index));
-
-        // merge Cappuccino plist
-        var cappPlistPath = rootPath.join("Info.plist");
-        if (cappPlistPath.isFile())
-            mergePlist(plist, cappPlistPath);
-
-        if (options.extraPlistPath)
-            mergePlist(plist, options.extraPlistPath);
-    });
-}

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);
@@ -264,8 +264,11 @@ var CPCacheDelegate_cache_willEvictObject_ = 1 << 1;
 
     // Sort keys by position
     var sortedKeys = [[_items allKeys] sortedArrayUsingFunction:
-        function(k1, k2) {
-            return [[[_items objectForKey:k1] position] compare:[[_items objectForKey:k2] position]]; }];
+            function(k1, k2)
+            {
+                return [[[_items objectForKey:k1] position] compare:[[_items objectForKey:k2] position]];
+            }
+        ];
 
     // Affect new positions
     for (var i = 0; i < sortedKeys.length; ++i)
@@ -300,8 +303,11 @@ var CPCacheDelegate_cache_willEvictObject_ = 1 << 1;
 
     // Sort keys by position
     var sortedKeys = [[_items allKeys] sortedArrayUsingFunction:
-        function(k1, k2) {
-            return [[[_items objectForKey:k1] position] compare:[[_items objectForKey:k2] position]]; }];
+            function(k1, k2)
+            {
+                return [[[_items objectForKey:k1] position] compare:[[_items objectForKey:k2] position]];
+            }
+        ];
 
     // Remove oldest objects until to satisfy the break condition
     for (var i = 0; i < sortedKeys.length; ++i)
@@ -313,7 +319,7 @@ var CPCacheDelegate_cache_willEvictObject_ = 1 << 1;
         [self _sendDelegateWillEvictObjectForKey:sortedKeys[i]];
 
         // Remove object
-        [_items removeObjectForKey: sortedKeys[i]];
+        [_items removeObjectForKey:sortedKeys[i]];
 
         // Invalid cost cache
         _totalCostCache = -1;
@@ -368,4 +374,4 @@ var CPCacheDelegate_cache_willEvictObject_ = 1 << 1;
     return cacheItem;
 }
 
-@end
+@end

Foundation/CPDate.j

@@ -115,7 +115,7 @@ var CPDateReferenceDate = new Date(Date.UTC(2001, 0, 1, 0, 0, 0, 0));
 */
 - (id)initWithString:(CPString)description
 {
-    var format = /(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2}):(\d{2}) ([-+])(\d{2})(\d{2})/,
+    var format = new RegExp("(\\d{4})-(\\d{2})-(\\d{2}) (\\d{2}):(\\d{2}):(\\d{2}) ([-+])(\\d{2})(\\d{2})"),
         d = description.match(new RegExp(format));
 
     if (!d || d.length != 10)
@@ -262,7 +262,7 @@ Date.parseISO8601 = function (date)
     // First, check for native parsing.
     timestamp = Date.parse(date);
 
-    if (isNaN(timestamp) && (struct = /^(\d{4}|[+\-]\d{6})(?:-(\d{2})(?:-(\d{2}))?)?(?:T(\d{2}):(\d{2})(?::(\d{2})(?:\.(\d{3}))?)?(?:(Z)|([+\-])(\d{2})(?::(\d{2}))?)?)?$/.exec(date)))
+    if (isNaN(timestamp) && (struct = new RegExp("^(\\d{4}|[+\\-]\\d{6})(?:-(\\d{2})(?:-(\\d{2}))?)?(?:T(\\d{2}):(\\d{2})(?::(\\d{2})(?:\\.(\\d{3}))?)?(?:(Z)|([+\\-])(\\d{2})(?::(\\d{2}))?)?)?$").exec(date)))
     {
         // avoid NaN timestamps caused by "undefined" values being passed to Date.UTC
         for (var i = 0, k; (k = numericKeys[i]); ++i)
@@ -294,4 +294,4 @@ function _isNumberType(value)
         return YES;
     else
         return NO;
-}
+}

Foundation/CPDateFormatter.j

@@ -1931,7 +1931,7 @@ var defaultDateFormatterBehavior = CPDateFormatterBehavior10_4,
 */
 - (int)_secondsFromTimeZoneDefaultFormatString:(CPString)aTimeZoneFormatString
 {
-    var format =  /\w*([HPG-GMT])?([+-])(\d{1,2})([:])?(\d{2})\w*/,
+    var format = new RegExp("\\w*([HPG-GMT])?([+-])(\\d{1,2})([:])?(\\d{2})\\w*"),
         result = aTimeZoneFormatString.match(new RegExp(format)),
         seconds = 0;
 
@@ -1969,7 +1969,7 @@ var defaultDateFormatterBehavior = CPDateFormatterBehavior10_4,
     var character = [aToken characterAtIndex:0],
         length = [aToken length],
         targetedArray,
-        format = /\w*([HPG-GMT])?([+-])(\d{1,2})([:])?(\d{2})\w*/,
+        format = new RegExp("\\w*([HPG-GMT])?([+-])(\\d{1,2})([:])?(\\d{2})\\w*"),
         result = aString.match(new RegExp(format));
 
     switch (character)

Foundation/CPDecimal.j

@@ -119,7 +119,7 @@ function CPDecimalMakeWithString(string, locale)
     // Note: this doesn't accept .01 for example, should it?
     // If yes simply add '?' after integer part group, i.e. ([+\-]?)((?:0|[1-9]\d*)?)
     // Note: now it accept .01 style.
-    var matches = string.match(/^([+\-]?)((?:0|[0-9]\d*)?)(?:\.(\d*))?(?:[eE]([+\-]?)(\d+))?$/);
+    var matches = string.match(new RegExp("^([+\\-]?)((?:0|[0-9]\\d*)?)(?:\\.(\\d*))?(?:[eE]([+\\-]?)(\\d+))?$"));
 
     if (!matches)
         return CPDecimalMakeNaN();

Foundation/CPKeyValueObserving.j

@@ -399,299 +399,299 @@ var kvoNewAndOld        = CPKeyValueObservingOptionNew | CPKeyValueObservingOpti
 
 - (void)_replaceModifiersForKey:(CPString)aKey
 {
-    if ([_replacedKeys containsObject:aKey] || ![_nativeClass automaticallyNotifiesObserversForKey:aKey])
-        return;
-
-    [_replacedKeys addObject:aKey];
-
-    var theClass = _nativeClass,
-        KVOClass = _targetObject.isa,
-        capitalizedKey = aKey.charAt(0).toUpperCase() + aKey.substring(1);
-
-    // Attribute and To-One Relationships
-    var setKey_selector = sel_getUid("set" + capitalizedKey + ":"),
-        setKey_method = class_getInstanceMethod(theClass, setKey_selector);
-
-    if (setKey_method)
+    if (![_replacedKeys containsObject:aKey] && [_nativeClass automaticallyNotifiesObserversForKey:aKey])
     {
-        var setKey_method_imp = setKey_method.method_imp;
+        [_replacedKeys addObject:aKey];
 
-        class_addMethod(KVOClass, setKey_selector, function(self, _cmd, anObject)
+        var theClass = _nativeClass,
+            KVOClass = _targetObject.isa,
+            capitalizedKey = aKey.charAt(0).toUpperCase() + aKey.substring(1);
+
+        // Attribute and To-One Relationships
+        var setKey_selector = sel_getUid("set" + capitalizedKey + ":"),
+            setKey_method = class_getInstanceMethod(theClass, setKey_selector);
+
+        if (setKey_method)
         {
-            [self willChangeValueForKey:aKey];
+            var setKey_method_imp = setKey_method.method_imp;
 
-            setKey_method_imp(self, _cmd, anObject);
-
-            [self didChangeValueForKey:aKey];
-        }, setKey_method.method_types);
-    }
-
-    // FIXME: Deprecated.
-    var _setKey_selector = sel_getUid("_set" + capitalizedKey + ":"),
-        _setKey_method = class_getInstanceMethod(theClass, _setKey_selector);
-
-    if (_setKey_method)
-    {
-        var _setKey_method_imp = _setKey_method.method_imp;
-
-        class_addMethod(KVOClass, _setKey_selector, function(self, _cmd, anObject)
-        {
-            [self willChangeValueForKey:aKey];
-
-            _setKey_method_imp(self, _cmd, anObject);
-
-            [self didChangeValueForKey:aKey];
-        }, _setKey_method.method_types);
-    }
-
-    // Ordered To-Many Relationships
-    var insertObject_inKeyAtIndex_selector = sel_getUid("insertObject:in" + capitalizedKey + "AtIndex:"),
-        insertObject_inKeyAtIndex_method =
-            class_getInstanceMethod(theClass, insertObject_inKeyAtIndex_selector),
-
-        insertKey_atIndexes_selector = sel_getUid("insert" + capitalizedKey + ":atIndexes:"),
-        insertKey_atIndexes_method =
-            class_getInstanceMethod(theClass, insertKey_atIndexes_selector),
-
-        removeObjectFromKeyAtIndex_selector = sel_getUid("removeObjectFrom" + capitalizedKey + "AtIndex:"),
-        removeObjectFromKeyAtIndex_method =
-            class_getInstanceMethod(theClass, removeObjectFromKeyAtIndex_selector),
-
-        removeKeyAtIndexes_selector = sel_getUid("remove" + capitalizedKey + "AtIndexes:"),
-        removeKeyAtIndexes_method = class_getInstanceMethod(theClass, removeKeyAtIndexes_selector);
-
-    if ((insertObject_inKeyAtIndex_method || insertKey_atIndexes_method) &&
-        (removeObjectFromKeyAtIndex_method || removeKeyAtIndexes_method))
-    {
-        if (insertObject_inKeyAtIndex_method)
-        {
-            var insertObject_inKeyAtIndex_method_imp = insertObject_inKeyAtIndex_method.method_imp;
-
-            class_addMethod(KVOClass, insertObject_inKeyAtIndex_selector, function(self, _cmd, anObject, anIndex)
+            class_addMethod(KVOClass, setKey_selector, function(self, _cmd, anObject)
             {
-                [self willChange:CPKeyValueChangeInsertion
-                 valuesAtIndexes:[CPIndexSet indexSetWithIndex:anIndex]
-                          forKey:aKey];
+                [self willChangeValueForKey:aKey];
 
-                insertObject_inKeyAtIndex_method_imp(self, _cmd, anObject, anIndex);
+                setKey_method_imp(self, _cmd, anObject);
 
-                [self didChange:CPKeyValueChangeInsertion
-                valuesAtIndexes:[CPIndexSet indexSetWithIndex:anIndex]
-                         forKey:aKey];
-            }, insertObject_inKeyAtIndex_method.method_types);
+                [self didChangeValueForKey:aKey];
+            }, setKey_method.method_types);
         }
 
-        if (insertKey_atIndexes_method)
+        // FIXME: Deprecated.
+        var _setKey_selector = sel_getUid("_set" + capitalizedKey + ":"),
+            _setKey_method = class_getInstanceMethod(theClass, _setKey_selector);
+
+        if (_setKey_method)
         {
-            var insertKey_atIndexes_method_imp = insertKey_atIndexes_method.method_imp;
+            var _setKey_method_imp = _setKey_method.method_imp;
 
-            class_addMethod(KVOClass, insertKey_atIndexes_selector, function(self, _cmd, objects, indexes)
+            class_addMethod(KVOClass, _setKey_selector, function(self, _cmd, anObject)
             {
-                [self willChange:CPKeyValueChangeInsertion
-                 valuesAtIndexes:[indexes copy]
-                          forKey:aKey];
+                [self willChangeValueForKey:aKey];
 
-                insertKey_atIndexes_method_imp(self, _cmd, objects, indexes);
+                _setKey_method_imp(self, _cmd, anObject);
 
-                [self didChange:CPKeyValueChangeInsertion
-                valuesAtIndexes:[indexes copy]
-                         forKey:aKey];
-            }, insertKey_atIndexes_method.method_types);
+                [self didChangeValueForKey:aKey];
+            }, _setKey_method.method_types);
         }
 
-        if (removeObjectFromKeyAtIndex_method)
+        // Ordered To-Many Relationships
+        var insertObject_inKeyAtIndex_selector = sel_getUid("insertObject:in" + capitalizedKey + "AtIndex:"),
+            insertObject_inKeyAtIndex_method =
+                class_getInstanceMethod(theClass, insertObject_inKeyAtIndex_selector),
+
+            insertKey_atIndexes_selector = sel_getUid("insert" + capitalizedKey + ":atIndexes:"),
+            insertKey_atIndexes_method =
+                class_getInstanceMethod(theClass, insertKey_atIndexes_selector),
+
+            removeObjectFromKeyAtIndex_selector = sel_getUid("removeObjectFrom" + capitalizedKey + "AtIndex:"),
+            removeObjectFromKeyAtIndex_method =
+                class_getInstanceMethod(theClass, removeObjectFromKeyAtIndex_selector),
+
+            removeKeyAtIndexes_selector = sel_getUid("remove" + capitalizedKey + "AtIndexes:"),
+            removeKeyAtIndexes_method = class_getInstanceMethod(theClass, removeKeyAtIndexes_selector);
+
+        if ((insertObject_inKeyAtIndex_method || insertKey_atIndexes_method) &&
+            (removeObjectFromKeyAtIndex_method || removeKeyAtIndexes_method))
         {
-            var removeObjectFromKeyAtIndex_method_imp = removeObjectFromKeyAtIndex_method.method_imp;
-
-            class_addMethod(KVOClass, removeObjectFromKeyAtIndex_selector, function(self, _cmd, anIndex)
+            if (insertObject_inKeyAtIndex_method)
             {
-                [self willChange:CPKeyValueChangeRemoval
-                 valuesAtIndexes:[CPIndexSet indexSetWithIndex:anIndex]
-                          forKey:aKey];
+                var insertObject_inKeyAtIndex_method_imp = insertObject_inKeyAtIndex_method.method_imp;
 
-                removeObjectFromKeyAtIndex_method_imp(self, _cmd, anIndex);
+                class_addMethod(KVOClass, insertObject_inKeyAtIndex_selector, function(self, _cmd, anObject, anIndex)
+                {
+                    [self willChange:CPKeyValueChangeInsertion
+                     valuesAtIndexes:[CPIndexSet indexSetWithIndex:anIndex]
+                              forKey:aKey];
 
-                [self didChange:CPKeyValueChangeRemoval
-                valuesAtIndexes:[CPIndexSet indexSetWithIndex:anIndex]
-                         forKey:aKey];
-            }, removeObjectFromKeyAtIndex_method.method_types);
+                    insertObject_inKeyAtIndex_method_imp(self, _cmd, anObject, anIndex);
+
+                    [self didChange:CPKeyValueChangeInsertion
+                    valuesAtIndexes:[CPIndexSet indexSetWithIndex:anIndex]
+                             forKey:aKey];
+                }, insertObject_inKeyAtIndex_method.method_types);
+            }
+
+            if (insertKey_atIndexes_method)
+            {
+                var insertKey_atIndexes_method_imp = insertKey_atIndexes_method.method_imp;
+
+                class_addMethod(KVOClass, insertKey_atIndexes_selector, function(self, _cmd, objects, indexes)
+                {
+                    [self willChange:CPKeyValueChangeInsertion
+                     valuesAtIndexes:[indexes copy]
+                              forKey:aKey];
+
+                    insertKey_atIndexes_method_imp(self, _cmd, objects, indexes);
+
+                    [self didChange:CPKeyValueChangeInsertion
+                    valuesAtIndexes:[indexes copy]
+                             forKey:aKey];
+                }, insertKey_atIndexes_method.method_types);
+            }
+
+            if (removeObjectFromKeyAtIndex_method)
+            {
+                var removeObjectFromKeyAtIndex_method_imp = removeObjectFromKeyAtIndex_method.method_imp;
+
+                class_addMethod(KVOClass, removeObjectFromKeyAtIndex_selector, function(self, _cmd, anIndex)
+                {
+                    [self willChange:CPKeyValueChangeRemoval
+                     valuesAtIndexes:[CPIndexSet indexSetWithIndex:anIndex]
+                              forKey:aKey];
+
+                    removeObjectFromKeyAtIndex_method_imp(self, _cmd, anIndex);
+
+                    [self didChange:CPKeyValueChangeRemoval
+                    valuesAtIndexes:[CPIndexSet indexSetWithIndex:anIndex]
+                             forKey:aKey];
+                }, removeObjectFromKeyAtIndex_method.method_types);
+            }
+
+            if (removeKeyAtIndexes_method)
+            {
+                var removeKeyAtIndexes_method_imp = removeKeyAtIndexes_method.method_imp;
+
+                class_addMethod(KVOClass, removeKeyAtIndexes_selector, function(self, _cmd, indexes)
+                {
+                    [self willChange:CPKeyValueChangeRemoval
+                     valuesAtIndexes:[indexes copy]
+                              forKey:aKey];
+
+                    removeKeyAtIndexes_method_imp(self, _cmd, indexes);
+
+                    [self didChange:CPKeyValueChangeRemoval
+                    valuesAtIndexes:[indexes copy]
+                             forKey:aKey];
+                }, removeKeyAtIndexes_method.method_types);
+            }
+
+            // These are optional.
+            var replaceObjectInKeyAtIndex_withObject_selector =
+                    sel_getUid("replaceObjectIn" + capitalizedKey + "AtIndex:withObject:"),
+                replaceObjectInKeyAtIndex_withObject_method =
+                    class_getInstanceMethod(theClass, replaceObjectInKeyAtIndex_withObject_selector);
+
+            if (replaceObjectInKeyAtIndex_withObject_method)
+            {
+                var replaceObjectInKeyAtIndex_withObject_method_imp =
+                        replaceObjectInKeyAtIndex_withObject_method.method_imp;
+
+                class_addMethod(KVOClass, replaceObjectInKeyAtIndex_withObject_selector,
+                function(self, _cmd, anIndex, anObject)
+                {
+                    [self willChange:CPKeyValueChangeReplacement
+                     valuesAtIndexes:[CPIndexSet indexSetWithIndex:anIndex]
+                              forKey:aKey];
+
+                    replaceObjectInKeyAtIndex_withObject_method_imp(self, _cmd, anIndex, anObject);
+
+                    [self didChange:CPKeyValueChangeReplacement
+                    valuesAtIndexes:[CPIndexSet indexSetWithIndex:anIndex]
+                             forKey:aKey];
+                }, replaceObjectInKeyAtIndex_withObject_method.method_types);
+            }
+
+            var replaceKeyAtIndexes_withKey_selector =
+                    sel_getUid("replace" + capitalizedKey + "AtIndexes:with" + capitalizedKey + ":"),
+                replaceKeyAtIndexes_withKey_method =
+                    class_getInstanceMethod(theClass, replaceKeyAtIndexes_withKey_selector);
+
+            if (replaceKeyAtIndexes_withKey_method)
+            {
+                var replaceKeyAtIndexes_withKey_method_imp = replaceKeyAtIndexes_withKey_method.method_imp;
+
+                class_addMethod(KVOClass, replaceKeyAtIndexes_withKey_selector, function(self, _cmd, indexes, objects)
+                {
+                    [self willChange:CPKeyValueChangeReplacement
+                     valuesAtIndexes:[indexes copy]
+                              forKey:aKey];
+
+                    replaceObjectInKeyAtIndex_withObject_method_imp(self, _cmd, indexes, objects);
+
+                    [self didChange:CPKeyValueChangeReplacement
+                    valuesAtIndexes:[indexes copy]
+                             forKey:aKey];
+                }, replaceKeyAtIndexes_withKey_method.method_types);
+            }
         }
 
-        if (removeKeyAtIndexes_method)
+        // Unordered To-Many Relationships
+        var addKeyObject_selector = sel_getUid("add" + capitalizedKey + "Object:"),
+            addKeyObject_method = class_getInstanceMethod(theClass, addKeyObject_selector),
+
+            addKey_selector = sel_getUid("add" + capitalizedKey + ":"),
+            addKey_method = class_getInstanceMethod(theClass, addKey_selector),
+
+            removeKeyObject_selector = sel_getUid("remove" + capitalizedKey + "Object:"),
+            removeKeyObject_method = class_getInstanceMethod(theClass, removeKeyObject_selector),
+
+            removeKey_selector = sel_getUid("remove" + capitalizedKey + ":"),
+            removeKey_method = class_getInstanceMethod(theClass, removeKey_selector);
+
+        if ((addKeyObject_method || addKey_method) && (removeKeyObject_method || removeKey_method))
         {
-            var removeKeyAtIndexes_method_imp = removeKeyAtIndexes_method.method_imp;
-
-            class_addMethod(KVOClass, removeKeyAtIndexes_selector, function(self, _cmd, indexes)
+            if (addKeyObject_method)
             {
-                [self willChange:CPKeyValueChangeRemoval
-                 valuesAtIndexes:[indexes copy]
-                          forKey:aKey];
+                var addKeyObject_method_imp = addKeyObject_method.method_imp;
 
-                removeKeyAtIndexes_method_imp(self, _cmd, indexes);
+                class_addMethod(KVOClass, addKeyObject_selector, function(self, _cmd, anObject)
+                {
+                    [self willChangeValueForKey:aKey
+                                withSetMutation:CPKeyValueUnionSetMutation
+                                   usingObjects:[CPSet setWithObject:anObject]];
 
-                [self didChange:CPKeyValueChangeRemoval
-                valuesAtIndexes:[indexes copy]
-                         forKey:aKey];
-            }, removeKeyAtIndexes_method.method_types);
-        }
+                    addKeyObject_method_imp(self, _cmd, anObject);
 
-        // These are optional.
-        var replaceObjectInKeyAtIndex_withObject_selector =
-                sel_getUid("replaceObjectIn" + capitalizedKey + "AtIndex:withObject:"),
-            replaceObjectInKeyAtIndex_withObject_method =
-                class_getInstanceMethod(theClass, replaceObjectInKeyAtIndex_withObject_selector);
+                    [self didChangeValueForKey:aKey
+                               withSetMutation:CPKeyValueUnionSetMutation
+                                  usingObjects:[CPSet setWithObject:anObject]];
+                }, addKeyObject_method.method_types);
+            }
 
-        if (replaceObjectInKeyAtIndex_withObject_method)
-        {
-            var replaceObjectInKeyAtIndex_withObject_method_imp =
-                    replaceObjectInKeyAtIndex_withObject_method.method_imp;
-
-            class_addMethod(KVOClass, replaceObjectInKeyAtIndex_withObject_selector,
-            function(self, _cmd, anIndex, anObject)
+            if (addKey_method)
             {
-                [self willChange:CPKeyValueChangeReplacement
-                 valuesAtIndexes:[CPIndexSet indexSetWithIndex:anIndex]
-                          forKey:aKey];
+                var addKey_method_imp = addKey_method.method_imp;
 
-                replaceObjectInKeyAtIndex_withObject_method_imp(self, _cmd, anIndex, anObject);
+                class_addMethod(KVOClass, addKey_selector, function(self, _cmd, objects)
+                {
+                    [self willChangeValueForKey:aKey
+                                withSetMutation:CPKeyValueUnionSetMutation
+                                   usingObjects:[objects copy]];
 
-                [self didChange:CPKeyValueChangeReplacement
-                valuesAtIndexes:[CPIndexSet indexSetWithIndex:anIndex]
-                         forKey:aKey];
-            }, replaceObjectInKeyAtIndex_withObject_method.method_types);
-        }
+                    addKey_method_imp(self, _cmd, objects);
 
-        var replaceKeyAtIndexes_withKey_selector =
-                sel_getUid("replace" + capitalizedKey + "AtIndexes:with" + capitalizedKey + ":"),
-            replaceKeyAtIndexes_withKey_method =
-                class_getInstanceMethod(theClass, replaceKeyAtIndexes_withKey_selector);
+                    [self didChangeValueForKey:aKey
+                               withSetMutation:CPKeyValueUnionSetMutation
+                                  usingObjects:[objects copy]];
+                }, addKey_method.method_types);
+            }
 
-        if (replaceKeyAtIndexes_withKey_method)
-        {
-            var replaceKeyAtIndexes_withKey_method_imp = replaceKeyAtIndexes_withKey_method.method_imp;
-
-            class_addMethod(KVOClass, replaceKeyAtIndexes_withKey_selector, function(self, _cmd, indexes, objects)
+            if (removeKeyObject_method)
             {
-                [self willChange:CPKeyValueChangeReplacement
-                 valuesAtIndexes:[indexes copy]
-                          forKey:aKey];
+                var removeKeyObject_method_imp = removeKeyObject_method.method_imp;
 
-                replaceObjectInKeyAtIndex_withObject_method_imp(self, _cmd, indexes, objects);
+                class_addMethod(KVOClass, removeKeyObject_selector, function(self, _cmd, anObject)
+                {
+                    [self willChangeValueForKey:aKey
+                                withSetMutation:CPKeyValueMinusSetMutation
+                                   usingObjects:[CPSet setWithObject:anObject]];
 
-                [self didChange:CPKeyValueChangeReplacement
-                valuesAtIndexes:[indexes copy]
-                         forKey:aKey];
-            }, replaceKeyAtIndexes_withKey_method.method_types);
-        }
-    }
+                    removeKeyObject_method_imp(self, _cmd, anObject);
 
-    // Unordered To-Many Relationships
-    var addKeyObject_selector = sel_getUid("add" + capitalizedKey + "Object:"),
-        addKeyObject_method = class_getInstanceMethod(theClass, addKeyObject_selector),
+                    [self didChangeValueForKey:aKey
+                               withSetMutation:CPKeyValueMinusSetMutation
+                                  usingObjects:[CPSet setWithObject:anObject]];
+                }, removeKeyObject_method.method_types);
+            }
 
-        addKey_selector = sel_getUid("add" + capitalizedKey + ":"),
-        addKey_method = class_getInstanceMethod(theClass, addKey_selector),
-
-        removeKeyObject_selector = sel_getUid("remove" + capitalizedKey + "Object:"),
-        removeKeyObject_method = class_getInstanceMethod(theClass, removeKeyObject_selector),
-
-        removeKey_selector = sel_getUid("remove" + capitalizedKey + ":"),
-        removeKey_method = class_getInstanceMethod(theClass, removeKey_selector);
-
-    if ((addKeyObject_method || addKey_method) && (removeKeyObject_method || removeKey_method))
-    {
-        if (addKeyObject_method)
-        {
-            var addKeyObject_method_imp = addKeyObject_method.method_imp;
-
-            class_addMethod(KVOClass, addKeyObject_selector, function(self, _cmd, anObject)
+            if (removeKey_method)
             {
-                [self willChangeValueForKey:aKey
-                            withSetMutation:CPKeyValueUnionSetMutation
-                               usingObjects:[CPSet setWithObject:anObject]];
+                var removeKey_method_imp = removeKey_method.method_imp;
 
-                addKeyObject_method_imp(self, _cmd, anObject);
+                class_addMethod(KVOClass, removeKey_selector, function(self, _cmd, objects)
+                {
+                    [self willChangeValueForKey:aKey
+                                withSetMutation:CPKeyValueMinusSetMutation
+                                   usingObjects:[objects copy]];
 
-                [self didChangeValueForKey:aKey
-                           withSetMutation:CPKeyValueUnionSetMutation
-                              usingObjects:[CPSet setWithObject:anObject]];
-            }, addKeyObject_method.method_types);
-        }
+                    removeKey_method_imp(self, _cmd, objects);
 
-        if (addKey_method)
-        {
-            var addKey_method_imp = addKey_method.method_imp;
+                    [self didChangeValueForKey:aKey
+                               withSetMutation:CPKeyValueMinusSetMutation
+                                  usingObjects:[objects copy]];
+                }, removeKey_method.method_types);
+            }
 
-            class_addMethod(KVOClass, addKey_selector, function(self, _cmd, objects)
+            // intersect<Key>: is optional.
+            var intersectKey_selector = sel_getUid("intersect" + capitalizedKey + ":"),
+                intersectKey_method = class_getInstanceMethod(theClass, intersectKey_selector);
+
+            if (intersectKey_method)
             {
-                [self willChangeValueForKey:aKey
-                            withSetMutation:CPKeyValueUnionSetMutation
-                               usingObjects:[objects copy]];
+                var intersectKey_method_imp = intersectKey_method.method_imp;
 
-                addKey_method_imp(self, _cmd, objects);
+                class_addMethod(KVOClass, intersectKey_selector, function(self, _cmd, aSet)
+                {
+                    [self willChangeValueForKey:aKey
+                                withSetMutation:CPKeyValueIntersectSetMutation
+                                   usingObjects:[aSet copy]];
 
-                [self didChangeValueForKey:aKey
-                           withSetMutation:CPKeyValueUnionSetMutation
-                              usingObjects:[objects copy]];
-            }, addKey_method.method_types);
-        }
+                    intersectKey_method_imp(self, _cmd, aSet);
 
-        if (removeKeyObject_method)
-        {
-            var removeKeyObject_method_imp = removeKeyObject_method.method_imp;
-
-            class_addMethod(KVOClass, removeKeyObject_selector, function(self, _cmd, anObject)
-            {
-                [self willChangeValueForKey:aKey
-                            withSetMutation:CPKeyValueMinusSetMutation
-                               usingObjects:[CPSet setWithObject:anObject]];
-
-                removeKeyObject_method_imp(self, _cmd, anObject);
-
-                [self didChangeValueForKey:aKey
-                           withSetMutation:CPKeyValueMinusSetMutation
-                              usingObjects:[CPSet setWithObject:anObject]];
-            }, removeKeyObject_method.method_types);
-        }
-
-        if (removeKey_method)
-        {
-            var removeKey_method_imp = removeKey_method.method_imp;
-
-            class_addMethod(KVOClass, removeKey_selector, function(self, _cmd, objects)
-            {
-                [self willChangeValueForKey:aKey
-                            withSetMutation:CPKeyValueMinusSetMutation
-                               usingObjects:[objects copy]];
-
-                removeKey_method_imp(self, _cmd, objects);
-
-                [self didChangeValueForKey:aKey
-                           withSetMutation:CPKeyValueMinusSetMutation
-                              usingObjects:[objects copy]];
-            }, removeKey_method.method_types);
-        }
-
-        // intersect<Key>: is optional.
-        var intersectKey_selector = sel_getUid("intersect" + capitalizedKey + ":"),
-            intersectKey_method = class_getInstanceMethod(theClass, intersectKey_selector);
-
-        if (intersectKey_method)
-        {
-            var intersectKey_method_imp = intersectKey_method.method_imp;
-
-            class_addMethod(KVOClass, intersectKey_selector, function(self, _cmd, aSet)
-            {
-                [self willChangeValueForKey:aKey
-                            withSetMutation:CPKeyValueIntersectSetMutation
-                               usingObjects:[aSet copy]];
-
-                intersectKey_method_imp(self, _cmd, aSet);
-
-                [self didChangeValueForKey:aKey
-                           withSetMutation:CPKeyValueIntersectSetMutation
-                              usingObjects:[aSet copy]];
-            }, intersectKey_method.method_types);
+                    [self didChangeValueForKey:aKey
+                               withSetMutation:CPKeyValueIntersectSetMutation
+                                  usingObjects:[aSet copy]];
+                }, intersectKey_method.method_types);
+            }
         }
     }
 
@@ -1300,6 +1300,10 @@ var kvoNewAndOld        = CPKeyValueObservingOptionNew | CPKeyValueObservingOpti
     if (aKeyPath === _firstPart)
     {
         var pathChanges = [CPMutableDictionary dictionaryWithObject:CPKeyValueChangeSetting forKey:CPKeyValueChangeKindKey];
+        var isBeforeFlag = !![changes objectForKey:CPKeyValueChangeNotificationIsPriorKey];
+
+        if (isBeforeFlag)
+            [pathChanges setObject:1 forKey:CPKeyValueChangeNotificationIsPriorKey];
 
         if (_options & CPKeyValueObservingOptionOld)
         {
@@ -1308,7 +1312,7 @@ var kvoNewAndOld        = CPKeyValueObservingOptionNew | CPKeyValueObservingOpti
             [pathChanges setObject:oldValue != null ? oldValue : [CPNull null] forKey:CPKeyValueChangeOldKey];
         }
 
-        if (_options & CPKeyValueObservingOptionNew)
+        if (!isBeforeFlag && (_options & CPKeyValueObservingOptionNew))
         {
             var newValue = [_object valueForKeyPath:_firstPart + "." + _secondPart];
 
@@ -1317,14 +1321,17 @@ var kvoNewAndOld        = CPKeyValueObservingOptionNew | CPKeyValueObservingOpti
 
         [_observer observeValueForKeyPath:_firstPart + "." + _secondPart ofObject:_object change:pathChanges context:_context];
 
-        //since a has changed, we should remove ourselves as an observer of the old a, and observe the new one
-        if (_value)
-            [_value removeObserver:self forKeyPath:_secondPart];
+        // Nothing has changed yet when doing willChange....
+        if (!isBeforeFlag) {
+            //since a has changed, we should remove ourselves as an observer of the old a, and observe the new one
+            if (_value)
+                [_value removeObserver:self forKeyPath:_secondPart];
 
-        _value = [_object valueForKey:_firstPart];
+            _value = [_object valueForKey:_firstPart];
 
-        if (_value)
-            [_value addObserver:self forKeyPath:_secondPart options:_options context:nil];
+            if (_value)
+                [_value addObserver:self forKeyPath:_secondPart options:_options context:nil];
+        }
     }
     else
     {

Foundation/CPLocale.j

@@ -61,9 +61,9 @@ CPLocaleLanguageDirectionRightToLeft        = @"CPLocaleLanguageDirectionRightTo
 CPLocaleLanguageDirectionTopToBottom        = @"CPLocaleLanguageDirectionTopToBottom";
 CPLocaleLanguageDirectionBottomToTop        = @"CPLocaleLanguageDirectionBottomToTop";
 
-var countryCodes = [@"DE", @"FR", @"ES", @"GB", @"US"],
-    languageCodes = [@"en", @"de", @"es", @"fr"],
-    availableLocaleIdentifiers = [@"de_DE", @"en_GB", @"en_US", @"es_ES", @"fr_FR"];
+var countryCodes = [@"DE", @"FR", @"ES", @"GB", @"US", @"SE"],
+    languageCodes = [@"en", @"de", @"es", @"fr", @"sv"],
+    availableLocaleIdentifiers = [@"de_DE", @"en_GB", @"en_US", @"es_ES", @"fr_FR", @"sv_SE"];
 
 var sharedSystemLocale = nil,
     sharedCurrentLocale = nil;

Foundation/CPObject.j

@@ -275,13 +275,13 @@ CPLog(@"Got some class: %@", inst);
 }
 
 /*!
-    Tests whether the receiver implements to the provided selector regardless of inheritance.
-    @param aSelector the selector for which to test the receiver
-    @return \c YES if the receiver implements the selector
+    Tests if instances of a given class implement the provided selector regardless of inheritance.
+    @param aSelector the selector for which to test the class
+    @return \c YES if instances of the class implement the selector
 */
-- (BOOL)implementsSelector:(SEL)aSelector
++ (BOOL)instancesImplementSelector:(SEL)aSelector
 {
-    var methods = class_copyMethodList(isa),
+    var methods = class_copyMethodList(self),
         count = methods.length;
 
     while (count--)
@@ -291,6 +291,16 @@ CPLog(@"Got some class: %@", inst);
     return NO;
 }
 
+/*!
+    Tests if the receiver implements the provided selector regardless of inheritance.
+    @param aSelector the selector for which to test the receiver
+    @return \c YES if the receiver implements the selector
+*/
+- (BOOL)implementsSelector:(SEL)aSelector
+{
+    return [[self class] instancesImplementSelector:aSelector];
+}
+
 /*!
     Test whether instances of this class conforms to the provided protocol.
     @param aProtocol the protocol for which to test the class

Foundation/CPRunLoop.j

@@ -200,6 +200,7 @@ var CPRunLoopLastNativeRunLoop = 0;
 
     CPArray _orderedPerforms;
     int     _runLoopInsuranceTimer;
+    CPArray _observers;
 }
 
 /*
@@ -224,6 +225,7 @@ var CPRunLoopLastNativeRunLoop = 0;
         _timersForModes = {};
         _nativeTimersForModes = {};
         _nextTimerFireDatesForModes = {};
+        _observers = nil;
     }
 
     return self;
@@ -473,9 +475,70 @@ var CPRunLoopLastNativeRunLoop = 0;
     else
         _orderedPerforms = performs;
 
+    if (_observers)
+    {
+        var count = _observers.length;
+        while(count--)
+        {
+            var obs = _observers[count];
+            obs.callout();
+
+            if (!obs.repeats)
+                _observers.splice(count, 1);
+        }
+    }
+
     _runLoopLock = NO;
 
     return nextFireDate;
 }
 
 @end
+
+function CFRunLoopObserver(activities, repeats, order, callout, context)
+{
+    this.activities = activities;
+    this.repeats = repeats;
+    this.order = order;
+    this.callout = callout;
+    this.context = context;
+
+    this.isvalid = true;
+};
+
+function CFRunLoopObserverCreate(activities, repeats, order, callout, context)
+{
+    return new CFRunLoopObserver(activities, repeats, order, callout, context);
+};
+
+function CFRunLoopAddObserver(runloop, observer, mode)
+{
+    var observers = runloop._observers;
+
+    if (!observers)
+        observers = (runloop._observers = []);
+
+    if (observers.indexOf(observer) == -1)
+        observers.push(observer);
+};
+
+function CFRunLoopObserverInvalidate(runloop, observer, mode)
+{
+    CFRunLoopRemoveObserver(runloop, observer, mode);
+};
+
+function CFRunLoopRemoveObserver(runloop, observer, mode)
+{
+    var observers = runloop._observers;
+    if (observers)
+    {
+        var idx = observers.indexOf(observer);
+        if (idx !== -1)
+        {
+            observers.splice(idx, 1);
+
+            if (observers.length == 0)
+                runloop._observers = nil;
+        }
+    }
+};

Foundation/CPURLRequest.j

@@ -97,6 +97,8 @@ CPURLRequestReturnCacheDataDontLoad = 3;
     {
         _cachePolicy = aCachePolicy;
         _timeoutInterval = aTimeoutInterval;
+        
+        [self _updateCacheControlHeader];
     }
 
     return self;
@@ -122,31 +124,8 @@ CPURLRequestReturnCacheDataDontLoad = 3;
         _cachePolicy = CPURLRequestUseProtocolCachePolicy;
 
         [self setValue:"Thu, 01 Jan 1970 00:00:00 GMT" forHTTPHeaderField:"If-Modified-Since"];
-
-        switch (_cachePolicy)
-        {
-            case CPURLRequestUseProtocolCachePolicy:
-                // TODO: implement everything about cache...
-                [self setValue:"no-cache" forHTTPHeaderField:"Cache-Control"];
-                break;
-
-            case CPURLRequestReturnCacheDataElseLoad:
-                [self setValue:"max-stale=31536000" forHTTPHeaderField:"Cache-Control"];
-                break;
-
-            case CPURLRequestReturnCacheDataDontLoad:
-                [self setValue:"only-if-cached" forHTTPHeaderField:"Cache-Control"];
-                break;
-
-            case CPURLRequestReloadIgnoringLocalCacheData:
-                [self setValue:"no-cache" forHTTPHeaderField:"Cache-Control"];
-                break;
-
-            default:
-                [self setValue:"no-cache" forHTTPHeaderField:"Cache-Control"];
-        }
-
         [self setValue:"XMLHttpRequest" forHTTPHeaderField:"X-Requested-With"];
+        [self _updateCacheControlHeader];
     }
 
     return self;
@@ -181,6 +160,35 @@ CPURLRequestReturnCacheDataDontLoad = 3;
     [_HTTPHeaderFields setObject:aValue forKey:aField];
 }
 
+/*
+  @ignore
+*/
+- (void)_updateCacheControlHeader
+{
+    switch (_cachePolicy)
+    {
+      case CPURLRequestUseProtocolCachePolicy:
+          // TODO: implement everything about cache...
+          [self setValue:"no-cache" forHTTPHeaderField:"Cache-Control"];
+          break;
+
+      case CPURLRequestReturnCacheDataElseLoad:
+          [self setValue:"max-stale=31536000" forHTTPHeaderField:"Cache-Control"];
+          break;
+
+      case CPURLRequestReturnCacheDataDontLoad:
+          [self setValue:"only-if-cached" forHTTPHeaderField:"Cache-Control"];
+          break;
+
+      case CPURLRequestReloadIgnoringLocalCacheData:
+          [self setValue:"no-cache" forHTTPHeaderField:"Cache-Control"];
+          break;
+
+      default:
+          [self setValue:"no-cache" forHTTPHeaderField:"Cache-Control"];
+    }
+}
+
 @end
 
 /*

Foundation/_CPCollectionKVCOperators.j

@@ -22,7 +22,7 @@
 
 @import "CPObject.j"
 
-var _CPCollectionKVCOperatorSimpleRE = /^@(avg|count|m(ax|in)|sum|unionOfObjects|distinctUnionOfObjects|unionOfArrays|distinctUnionOfArrays|distinctUnionOfSets)(\.|$)/;
+var _CPCollectionKVCOperatorSimpleRE = new RegExp("^@(avg|count|m(ax|in)|sum|unionOfObjects|distinctUnionOfObjects|unionOfArrays|distinctUnionOfArrays|distinctUnionOfSets)(\\.|$)");
 
 
 @implementation _CPCollectionKVCOperator : CPObject

Objective-J/Bootstrap.js

@@ -49,17 +49,26 @@ if (DOMBaseElementsCount > 0)
 
 if (typeof OBJJ_COMPILER_FLAGS !== 'undefined')
 {
-    var flags = 0;
+    var flags = {};
     for (var i = 0; i < OBJJ_COMPILER_FLAGS.length; i++)
     {
-        var flag = ObjJAcornCompiler.Flags[OBJJ_COMPILER_FLAGS[i]];
-
-        if (flag != null)
+        switch (OBJJ_COMPILER_FLAGS[i])
         {
-            flags |= flag;
+            case "IncludeDebugSymbols":
+                flags.includeMethodFunctionNames = true;
+                break;
+
+            case "IncludeTypeSignatures":
+                flags.includeIvarTypeSignatures = true;
+                flags.includeMethodArgumentTypeSignatures = true;
+                break;
+
+            case "InlineMsgSend":
+                flags.inlineMsgSendFunctions = true;
+                break;
         }
     }
-    exports.setCurrentCompilerFlags(flags);
+    FileExecutable.setCurrentCompilerFlags(flags);
 }
 
 // Turn the main file into a URL.

Objective-J/CFHTTPRequest.js

@@ -371,7 +371,7 @@ function FileRequest(/*CFURL*/ aURL, onsuccess, onfailure, onprogress)
     {
         var aFilePath = aURL.toString().substring(5),
             OS = require("os"),
-            gccFlags = require("objective-j").currentGccCompilerFlags(),
+            gccFlags = require("objective-j").FileExecutable.currentGccCompilerFlags(),
             chunk,
             fileContents = "";
 

Objective-J/CommonJS/lib/objective-j.js

@@ -1,6 +1,7 @@
 
 var FILE = require("file");
 var sprintf = require("printf").sprintf;
+var OS = require("os");
 
 var window = exports.window = require("browser/window");
 
@@ -80,6 +81,7 @@ exports.run = function(args)
 
         // copy the args since we're going to modify them
         var argv = args.slice(1);
+        var outputFormatInXML = false;
 
         if (argv[0] === "--version" || argv[0] === "-v")
         {
@@ -120,25 +122,33 @@ exports.run = function(args)
                 case "-x":
                 case "--xml":
                     argv.shift();
-                    exports.outputFormatInXML = true;
+                    exports.messageOutputFormatInXML = true;
+                    outputFormatInXML = true;
                     break;
 
                 case "-g":
                 case "--include-debug-symbols":
                     argv.shift();
-                    (OBJJ_COMPILER_FLAGS || (OBJJ_COMPILER_FLAGS = [])).push("IncludeDebugSymbols");
+                    var flags = ObjectiveJ.FileExecutable.currentCompilerFlags();
+                    flags.includeMethodFunctionNames = true;
+                    ObjectiveJ.FileExecutable.setCurrentCompilerFlags(flags);
                     break;
 
                 case "-T":
                 case "--dont-include-type-signatures":
                     argv.shift();
-                    (OBJJ_COMPILER_FLAGS || (OBJJ_COMPILER_FLAGS = [])).push("IncludeTypeSignatures");
+                    var flags = ObjectiveJ.FileExecutable.currentCompilerFlags();
+                    flags.includeIvarTypeSignatures = true;
+                    flags.includeMethodArgumentTypeSignatures = true;
+                    ObjectiveJ.FileExecutable.setCurrentCompilerFlags(flags);
                     break;
 
                 case "-O2":
                 case "--inline-msg-send":
                     argv.shift();
-                    (OBJJ_COMPILER_FLAGS || (OBJJ_COMPILER_FLAGS = [])).push("InlineMsgSend");
+                    var flags = ObjectiveJ.FileExecutable.currentCompilerFlags();
+                    flags.inlineMsgSendFunctions = true;
+                    ObjectiveJ.FileExecutable.setCurrentCompilerFlags(flags);
                     break;
             }
         }
@@ -160,19 +170,7 @@ exports.run = function(args)
             }
             catch(e)
             {
-                if (exports.outputFormatInXML)
-                {
-                    var dict = new CFMutableDictionary();
-                    dict.addValueForKey('line', e.line ? e.line : 0);
-                    dict.addValueForKey('sourcePath', e.path ? e.path : mainFilePath);
-                    dict.addValueForKey('message', e.message);
-
-                    errors.push(dict);
-                }
-                else
-                {
-                    errors.push("\n" + e);
-                }
+                errors.push(e);
             }
 
             if (typeof main === "function")
@@ -194,10 +192,8 @@ exports.run = function(args)
 
         if (errors.length)
         {
-            if (exports.outputFormatInXML)
-                throw CFPropertyListCreateXMLData(errors, kCFPropertyListXMLFormat_v1_0).rawString();
-            else
-                throw errors;
+            // Make sure we get exit will failiure
+            OS.exit(1);
         }
     }
     else
@@ -271,7 +267,6 @@ function getPackage() {
 exports.version = function() { return getPackage()["version"]; }
 exports.revision = function() { return getPackage()["cappuccino-revision"]; }
 exports.timestamp = function() { return new Date(getPackage()["cappuccino-timestamp"]); }
-exports.outputFormatInXML = false;
 
 exports.fullVersionString = function() {
     return sprintf("objective-j %s (%04d-%02d-%02d %s)",

Objective-J/CommonJS/lib/objective-j/compiler.js

@@ -6,10 +6,6 @@ var FILE = require("file"),
 
 require("objective-j/rhino/regexp-rhino-patch");
 
-ObjectiveJ.ObjJAcornCompiler.Flags.Preprocess   = 1 << 10;
-ObjectiveJ.ObjJAcornCompiler.Flags.Compress     = 1 << 11;
-ObjectiveJ.ObjJAcornCompiler.Flags.CheckSyntax  = 1 << 12;
-
 var compressors = {
     ss  : { id : "minify/shrinksafe" }
     //,yui : { id : "minify/yuicompressor" }
@@ -37,9 +33,8 @@ function compressor(code)
 
 function compileWithResolvedFlags(aFilePath, objjcFlags, gccFlags, asPlainJavascript)
 {
-    var shouldObjjPreprocess = objjcFlags & ObjectiveJ.ObjJAcornCompiler.Flags.Preprocess,
-        shouldCheckSyntax = objjcFlags & ObjectiveJ.ObjJAcornCompiler.Flags.CheckSyntax,
-        shouldCompress = objjcFlags & ObjectiveJ.ObjJAcornCompiler.Flags.Compress,
+    var shouldObjjPreprocess = true,
+        shouldCompress = objjcFlags.compress,
         fileContents = "",
         executable,
         code;
@@ -118,7 +113,7 @@ function compileWithResolvedFlags(aFilePath, objjcFlags, gccFlags, asPlainJavasc
             }
         }
 
-        ObjectiveJ.setCurrentCompilerFlags(objjcFlags);
+        ObjectiveJ.FileExecutable.setCurrentCompilerFlags(objjcFlags);
         ObjectiveJ.make_narwhal_factory(absolutePath, basePath, translateFilenameToPath)(require, {}, module, system, print);
 
         executable = new ObjectiveJ.FileExecutable(FILE.basename(aFilePath));
@@ -153,7 +148,7 @@ function resolveFlags(args)
         count = args.length,
 
         gccFlags = [],
-        objjcFlags = ObjectiveJ.ObjJAcornCompiler.Flags.Preprocess | ObjectiveJ.ObjJAcornCompiler.Flags.CheckSyntax;
+        objjcFlags = {};
 
     for (; index < count; ++index)
     {
@@ -180,27 +175,23 @@ function resolveFlags(args)
             }
         }
 
-        else if (argument.indexOf("-E") === 0)
-            objjcFlags &= ~ObjectiveJ.ObjJAcornCompiler.Flags.Preprocess;
-
-        else if (argument.indexOf("-S") === 0)
-            objjcFlags &= ~ObjectiveJ.ObjJAcornCompiler.Flags.CheckSyntax;
-
         else if (argument.indexOf("-T") === 0)
-            objjcFlags &= ~ObjectiveJ.ObjJAcornCompiler.Flags.IncludeTypeSignatures;
-
+        {
+            objjcFlags.includeIvarTypeSignatures = false;
+            objjcFlags.includeMethodArgumentTypeSignatures = false;
+        }
         else if (argument.indexOf("-g") === 0)
-            objjcFlags |= ObjectiveJ.ObjJAcornCompiler.Flags.IncludeDebugSymbols;
+            objjcFlags.includeMethodFunctionNames = true;
 
         else if (argument.indexOf("-O") === 0) {
-            objjcFlags |= ObjectiveJ.ObjJAcornCompiler.Flags.Compress;
+            objjcFlags.compress = true;
             // FIXME: currently we are sending in '-O2' when we want InlineMsgSend. Here we only check if we it is '-O...'
             if (argument.length > 2)
-                objjcFlags |= ObjectiveJ.ObjJAcornCompiler.Flags.InlineMsgSend;
+                objjcFlags.inlineMsgSendFunctions = true;
         }
 
         else if (argument.indexOf("-G") === 0)
-            objjcFlags |= ObjectiveJ.ObjJAcornCompiler.Flags.Generate;
+            objjcFlags.generate = true;
 
         else
             filePaths.push(argument);
@@ -223,7 +214,7 @@ exports.main = function(args)
 {
     var shouldPrintOutput = false,
         asPlainJavascript = false,
-        objjcFlags = 0;
+        objjcFlags = {};
 
     var argv = args.slice(1);
 
@@ -251,7 +242,8 @@ exports.main = function(args)
 
         if (argv[0] === "-T" || argv[0] === "--includeTypeSignatures")
         {
-            objjcFlags |= ObjectiveJ.ObjJAcornCompiler.Flags.IncludeTypeSignatures;
+            objjcFlags.includeIvarTypeSignatures = true;
+            objjcFlags.includeMethodArgumentTypeSignatures = true;
             argv.shift();
             continue;
         }
@@ -280,9 +272,19 @@ exports.main = function(args)
 
     var resolved = resolveFlags(argv),
         outputFilePaths = resolved.outputFilePaths,
-        gccFlags = resolved.gccFlags;
+        gccFlags = resolved.gccFlags,
+        resolvedObjjcFlags = resolved.objjcFlags;
+
+    // Merge resolved keys into objjcFlags
+    for (var key in resolvedObjjcFlags)
+    {
+        if (resolvedObjjcFlags.hasOwnProperty(key))
+        {
+            if (resolvedObjjcFlags[key])
+                objjcFlags[key] = resolvedObjjcFlags[key];
+        }
+    }
 
-    objjcFlags |= resolved.objjcFlags;
     resolved.filePaths.forEach(function(filePath, index)
     {
         if (!shouldPrintOutput)

Objective-J/CommonJS/lib/objective-j/jake/bundletask.js

@@ -907,7 +907,7 @@ BundleTask.prototype.defineSourceTasks = function()
                         basePath = absolutePath.substring(0, absolutePath.length - theTranslatedFilename.length);
 
                     // Here we set the current compiler flags so the load system will know what compiler flags to use
-                    ObjectiveJ.setCurrentGccCompilerFlags(environmentCompilerFlags);
+                    ObjectiveJ.FileExecutable.setCurrentGccCompilerFlags(environmentCompilerFlags);
                     // Here we tell the CFBundle to load frameworks for the current build enviroment and not the enviroment that is running
                     CFBundle.environments = function() {return [anEnvironment.name(), "ObjJ"]};
                     ObjectiveJ.make_narwhal_factory(absolutePath, basePath, translateFilenameToPath)(require, e, module, system, print);

Objective-J/Executable.js

@@ -169,6 +169,10 @@ Executable.prototype.execute = function()
         this._compiler.popImport();
 
         this.setCode(this._compiler.compilePass2());
+
+    if (FileExecutable.printWarningsAndErrors(this._compiler, exports.messageOutputFormatInXML))
+            throw "Compilation error";
+
         this._compiler = null;
     }
 
@@ -471,7 +475,6 @@ Executable.fileExecutableSearcherForURL = function(/*CFURL*/ referenceURL)
     var referenceURLString = referenceURL.absoluteString(),
         cachedFileExecutableSearcher = cachedFileExecutableSearchers[referenceURLString],
         aFilenameTranslateDictionary = Executable.filenameTranslateDictionary ? Executable.filenameTranslateDictionary() : null;
-        cachedSearchResults = { };
 
     if (!cachedFileExecutableSearcher)
     {
@@ -499,7 +502,7 @@ Executable.fileExecutableSearcherForURL = function(/*CFURL*/ referenceURL)
             {
                 if (!aStaticResource)
                 {
-                    var compilingFileUrl = ObjJAcornCompiler ? ObjJAcornCompiler.currentCompileFile : null;
+                    var compilingFileUrl = exports.ObjJCompiler ? exports.ObjJCompiler.currentCompileFile : null;
                     throw new Error("Could not load file at " + aURL + (compilingFileUrl ? " when compiling " + compilingFileUrl : ""));
                 }
 

Objective-J/FileExecutable.js

@@ -22,6 +22,9 @@
 
 var FileExecutablesForURLStrings = { };
 
+var currentCompilerFlags = {};
+var currentGccCompilerFlags = "";
+
 function FileExecutable(/*CFURL|String*/ aURL, /*Dictionary*/ aFilenameTranslateDictionary)
 {
     aURL = makeAbsoluteURL(aURL);
@@ -41,7 +44,17 @@ function FileExecutable(/*CFURL|String*/ aURL, /*Dictionary*/ aFilenameTranslate
     if (fileContents.match(/^@STATIC;/))
         executable = decompile(fileContents, aURL);
     else if ((extension === "j" || !extension) && !fileContents.match(/^{/))
-        executable = exports.ObjJAcornCompiler.compileFileDependencies(fileContents, aURL, exports.currentCompilerFlags());
+    {
+        var compiler = exports.ObjJCompiler.compileFileDependencies(fileContents, aURL, currentCompilerFlags || {});
+
+        if (FileExecutable.printWarningsAndErrors(compiler, exports.messageOutputFormatInXML))
+            throw "Compilation error";
+
+        var fileDependencies = compiler.dependencies.map(function (aFileDep) {
+            return new FileDependency(new CFURL(aFileDep.url), aFileDep.isLocal);
+        });
+        executable = new Executable(compiler.jsBuffer ? compiler.jsBuffer.toString() : null, fileDependencies, compiler.URL, null, compiler);
+    }
     else
         executable = new Executable(fileContents, [], aURL);
 
@@ -139,3 +152,110 @@ FileExecutable._lookupCachedFunction = function(/*CFURL|String*/ aURL)
     aURL = typeof aURL === "string" ? aURL : aURL.absoluteString();
     return FunctionCache[aURL];
 }
+
+FileExecutable.setCurrentGccCompilerFlags = function(/*String*/ compilerFlags)
+{
+    if (currentGccCompilerFlags === compilerFlags) return;
+
+    currentGccCompilerFlags = compilerFlags;
+
+    var args = compilerFlags.split(" "),
+        count = args.length,
+        objjcFlags = {};
+
+    for (var index = 0; index < count; ++index)
+    {
+        var argument = args[index];
+
+        if (argument.indexOf("-g") === 0)
+            objjcFlags.includeMethodFunctionNames = true;
+        else if (argument.indexOf("-O") === 0) {
+            objjcFlags.inlineMsgSendFunctions = true;
+            // FIXME: currently we are sending in '-O2' when we want InlineMsgSend. Here we only check if it is '-O...'.
+            // Maybe we should have some other option for this
+            if (argument.length > 2)
+                objjcFlags.inlineMsgSendFunctions = true;
+        }
+        //else if (argument.indexOf("-G") === 0)
+            //objjcFlags |= ObjJAcornCompiler.Flags.Generate;
+        else if (argument.indexOf("-T") === 0) {
+            objjcFlags.includeIvarTypeSignatures = false;
+            objjcFlags.includeMethodArgumentTypeSignatures = false;
+        }
+    }
+
+    FileExecutable.setCurrentCompilerFlags(objjcFlags);
+}
+
+FileExecutable.currentGccCompilerFlags = function(/*String*/ compilerFlags)
+{
+    return currentGccCompilerFlags;
+}
+
+FileExecutable.setCurrentCompilerFlags = function(/*JSObject*/ compilerFlags)
+{
+    currentCompilerFlags = compilerFlags;
+    // Here we set the default flags if they are not included. We do this as the default values
+    // in the compiler might not be what we want.
+    if (currentCompilerFlags.transformNamedFunctionDeclarationToAssignment == null)
+        currentCompilerFlags.transformNamedFunctionDeclarationToAssignment = true;
+    if (currentCompilerFlags.sourceMap == null)
+        currentCompilerFlags.sourceMap = false;
+    if (currentCompilerFlags.inlineMsgSendFunctions == null)
+        currentCompilerFlags.inlineMsgSendFunctions = false;
+}
+
+FileExecutable.currentCompilerFlags = function(/*JSObject*/ compilerFlags)
+{
+    return currentCompilerFlags;
+}
+
+/*!
+    This funtion prints all errors and warnings for the provieded compiler. It returns true if there
+    are any errors in the list. it will print it in xml format if printXML is 'true'
+ */
+FileExecutable.printWarningsAndErrors = function(/*ObjJCompiler*/ compiler, /*BOOL*/ printXML)
+{
+    var warnings = [],
+        anyErrors = false;
+
+    for (var i = 0; i < compiler.warningsAndErrors.length; i++)
+    {
+        var warning = compiler.warningsAndErrors[i],
+            message = compiler.prettifyMessage(warning);
+
+        // Set anyErrors to 'true' if there are any errors in the list
+        anyErrors = anyErrors || warning.messageType === "ERROR";
+#ifdef BROWSER
+        console.log(message);
+#else
+        if (printXML)
+        {
+            var dict = new CFMutableDictionary();
+            if (warning.messageOnLine != null) dict.addValueForKey('line', warning.messageOnLine)
+            if (warning.path != null) dict.addValueForKey('sourcePath', new CFURL(warning.path).path())
+            if (message != null) dict.addValueForKey('message', message)
+
+            warnings.push(dict);
+        }
+        else
+        {
+            print(message);
+        }
+#endif
+    }
+
+#ifndef BROWSER
+    if (warnings.length && printXML)
+        try {
+            print(CFPropertyListCreateXMLData(warnings, kCFPropertyListXMLFormat_v1_0).rawString());
+        } catch (e) {
+            print ("XML encode error: " + e);
+        }
+#endif
+
+    return anyErrors;
+}
+
+// Set the compiler flags to empty dictionary so the default values are correct.
+FileExecutable.setCurrentCompilerFlags({});

Objective-J/Runtime.js

@@ -322,7 +322,7 @@ GLOBAL(class_addProtocol) = function(/*Class*/ aClass, /*Protocol*/ aProtocol)
         return;
     }
 
-    (aClass.protocol_list || (aClass.protocol_list == [])).push(aProtocol);
+    (aClass.protocol_list || (aClass.protocol_list = [])).push(aProtocol);
 
     return true;
 }

Objective-J/acornwalk.js

@@ -101,8 +101,7 @@ if (!exports.acorn) {
   };
   exports.TryStatement = function(node, st, c) {
     c(node.block, st, "Statement");
-    for (var i = 0; i < node.handlers.length; ++i)
-      c(node.handlers[i].body, st, "ScopeBody");
+    if (node.handler) c(node.handler.body, st, "ScopeBody");
     if (node.finalizer) c(node.finalizer, st, "Statement");
   };
   exports.WhileStatement = function(node, st, c) {
@@ -267,10 +266,10 @@ if (!exports.acorn) {
     },
     TryStatement: function(node, scope, c) {
       c(node.block, scope, "Statement");
-      for (var i = 0; i < node.handlers.length; ++i) {
-        var handler = node.handlers[i], inner = makeScope(scope);
-        inner.vars[handler.param.name] = {type: "catch clause", node: handler.param};
-        c(handler.body, inner, "ScopeBody");
+      if (node.handler) {
+        var inner = makeScope(scope);
+        inner.vars[node.handler.param.name] = {type: "catch clause", node: node.handler.param};
+        c(node.handler.body, inner, "ScopeBody");
       }
       if (node.finalizer) c(node.finalizer, scope, "Statement");
     },

README.markdown

@@ -19,8 +19,11 @@ For more information, see <http://cappuccino-project.org>. Follow [@cappuccino](
 
 System Requirements
 -------------------
-To run Cappuccino applications, all you need is a web browser that understands
-JavaScript.
+To run Cappuccino applications, all you need is a HTML5 compliant web browser.
+
+To develop Cappuccino applications, all you need is a simple text editor and the starter package.
+
+However, Cappuccino's build system and the Xcode integration bring the eases of Cocoa development to web development. 
 
 To build Cappuccino itself, please read below. More information is available
 here: [Getting and Building the Source](http://wiki.github.com/cappuccino/cappuccino/getting-and-building-the-source>).
@@ -35,7 +38,7 @@ Getting Started
 ---------------
 To get started, download and install the current release version of Cappuccino:
 
-    $ curl https://raw.githubusercontent.com/cappuccino/cappuccino/v0.9.9/bootstrap.sh >/tmp/cappuccino_bootstrap.sh && bash /tmp/cappuccino_bootstrap.sh
+    $ curl https://raw.githubusercontent.com/cappuccino/cappuccino/v0.9.10/bootstrap.sh >/tmp/cappuccino_bootstrap.sh && bash /tmp/cappuccino_bootstrap.sh
 
 If you'd just like to get started using Cappuccino for your web apps, you are done.
 

Rakefile

@@ -1,13 +0,0 @@
-#!/usr/bin/env ruby
-
-puts <<-eos
-    Building with rake is no longer supported, use "jake" instead.
-
-    The commands are all the same (e.g. rake install -> jake install).
-
-    If you do not have jake, you can run sudo ./bootstrap.sh to install jake and it's dependencies.
-
-    PLEASE remove your Build folder ($CAPP_BUILD if it's set) when switching from rake to jake.
-eos
-
-exit(1);

Tests/AppKit/BundleTest/Info.plist

@@ -0,0 +1,10 @@
+<?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>BundleTest</string>
+</dict>
+</plist>

Tests/AppKit/BundleTest/Resources/NSViewController.cib

@@ -0,0 +1 @@
+280NPLIST;1.0;D;K;4;$topD;K;18;CPCibObjectDataKeyD;K;6;CP$UIDd;1;2E;E;K;8;$objectsA;S;5;$nullD;K;10;$classnameS;16;_CPCibObjectDataK;8;$classesA;S;16;_CPCibObjectDataS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;1;1E;K;28;_CPCibObjectDataNamesKeysKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataNamesValuesKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataClassesKeysKeyD;K;6;CP$UIDd;1;0E;K;32;_CPCibObjectDataClassesValuesKeyD;K;6;CP$UIDd;1;0E;K;30;_CPCibObjectDataConnectionsKeyD;K;6;CP$UIDd;1;4E;K;28;_CPCibObjectDataFrameworkKeyD;K;6;CP$UIDd;1;0E;K;26;_CPCibObjectDataNextOidKeyD;K;6;CP$UIDd;1;5E;K;30;_CPCibObjectDataObjectsKeysKeyD;K;6;CP$UIDd;1;6E;K;32;_CPCibObjectDataObjectsValuesKeyD;K;6;CP$UIDd;1;7E;K;26;_CPCibObjectDataOidKeysKeyD;K;6;CP$UIDd;1;8E;K;28;_CPCibObjectDataOidValuesKeyD;K;6;CP$UIDd;1;9E;K;28;_CPCibObjectDataFileOwnerKeyD;K;6;CP$UIDd;2;11E;K;33;_CPCibObjectDataVisibleWindowsKeyD;K;6;CP$UIDd;2;13E;E;D;K;10;$classnameS;7;CPArrayK;8;$classesA;S;7;CPArrayS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;15E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;16E;D;K;6;CP$UIDd;2;18E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;D;K;6;CP$UIDd;2;11E;D;K;6;CP$UIDd;2;11E;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;D;K;10;$classnameS;18;_CPCibCustomObjectK;8;$classesA;S;18;_CPCibCustomObjectS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;10E;K;27;_CPCibCustomObjectClassNameD;K;6;CP$UIDd;2;19E;E;D;K;10;$classnameS;5;CPSetK;8;$classesA;S;5;CPSetS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;12E;K;15;CPSetObjectsKeyD;K;6;CP$UIDd;2;20E;E;D;K;10;$classnameS;20;CPCibOutletConnectorK;8;$classesA;S;20;CPCibOutletConnectorS;14;CPCibConnectorS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;14E;K;24;_CPCibConnectorSourceKeyD;K;6;CP$UIDd;2;11E;K;29;_CPCibConnectorDestinationKeyD;K;6;CP$UIDd;2;18E;K;23;_CPCibConnectorLabelKeyD;K;6;CP$UIDd;2;21E;E;D;K;6;$classD;K;6;CP$UIDd;2;10E;K;27;_CPCibCustomObjectClassNameD;K;6;CP$UIDd;2;22E;E;D;K;10;$classnameS;18;_CPCibClassSwapperK;8;$classesA;S;18;_CPCibClassSwapperS;8;CPObjectE;E;D;K;6;$classD;K;6;CP$UIDd;2;17E;K;18;CPResponderMenuKeyD;K;6;CP$UIDd;1;0E;K;12;CPViewTagKeyD;K;6;CP$UIDd;2;23E;K;14;CPViewFrameKeyD;K;6;CP$UIDd;2;24E;K;15;CPViewBoundsKeyD;K;6;CP$UIDd;2;24E;K;22;CPViewAutoresizingMaskD;K;6;CP$UIDd;2;25E;K;19;CPViewThemeClassKeyD;K;6;CP$UIDd;1;0E;K;19;CPViewThemeStateKeyD;K;6;CP$UIDd;2;26E;K;14;CPViewScaleKeyD;K;6;CP$UIDd;2;27E;K;18;CPViewSizeScaleKeyD;K;6;CP$UIDd;2;27E;K;17;CPViewIsScaledKeyD;K;6;CP$UIDd;2;28E;K;19;CPViewAppearanceKeyD;K;6;CP$UIDd;1;0E;K;22;CPViewTrackingAreasKeyD;K;6;CP$UIDd;2;29E;K;30;_CPCibClassSwapperClassNameKeyD;K;6;CP$UIDd;2;30E;K;38;_CPCibClassSwapperOriginalClassNameKeyD;K;6;CP$UIDd;2;31E;E;S;16;CPViewControllerD;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;S;4;viewS;13;CPApplicationd;1;0S;20;{{0, 0}, {480, 272}}d;2;12S;6;normalS;6;{1, 1}F;D;K;6;$classD;K;6;CP$UIDd;1;3E;K;10;CP.objectsA;E;E;S;6;NSViewS;6;CPViewE;K;9;$archiverS;15;CPKeyedArchiverK;8;$versionS;6;100000E;

Tests/AppKit/BundleTest/Resources/NSViewController.xib

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10116"/>
+    </dependencies>
+    <objects>
+        <customObject id="-2" userLabel="File's Owner" customClass="CPViewController">
+            <connections>
+                <outlet property="view" destination="c22-O7-iKe" id="ABk-lK-Kp8"/>
+            </connections>
+        </customObject>
+        <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>
+        <customObject id="-3" userLabel="Application" customClass="NSObject"/>
+        <customView id="c22-O7-iKe">
+            <rect key="frame" x="0.0" y="0.0" width="480" height="272"/>
+            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+        </customView>
+    </objects>
+</document>

Tests/AppKit/CPCollectionViewTest.j

@@ -62,6 +62,49 @@
     [self assert:[CPIndexSet indexSet] equals:[_collectionView selectionIndexes]];
 }
 
+- (void)_testCollectionViewItemIsSelected
+{
+    var itemPrototype = [[CPCollectionViewItem alloc] init];
+    [_collectionView setItemPrototype:itemPrototype];
+    [_collectionView setContent:[1, 2, 3]];
+
+    [_collectionView setSelectionIndexes:[CPIndexSet indexSetWithIndex:1]];
+    [self assertTrue:[[_collectionView itemAtIndex:1] isSelected]];
+
+    [_collectionView setSelectionIndexes:[CPIndexSet indexSetWithIndex:0]];
+    [self assertTrue:[[_collectionView itemAtIndex:0] isSelected]];
+    // The item is correctly deselected when the selection indexes changes.
+    [self assertFalse:[[_collectionView itemAtIndex:1] isSelected]];
+}
+
+- (void)testBindingSupport
+{
+    var content = [1,2,3];
+    var ac = [[CPArrayController alloc] initWithContent:content];
+    [ac setSelectsInsertedObjects:YES];
+    [_collectionView bind:CPContentBinding toObject:ac withKeyPath:@"arrangedObjects" options:nil];
+    [_collectionView bind:CPSelectionIndexesBinding toObject:ac withKeyPath:@"selectionIndexes" options:nil];
+
+    [self assert:[1,2,3] equals:[_collectionView content]];
+
+    [ac setContent:[6,7]];
+    [self assert:[6,7] equals:[_collectionView content]];
+
+    [ac setSelectionIndexes:[CPIndexSet indexSetWithIndex:1]];
+    [self assert:[CPIndexSet indexSetWithIndex:1] equals:[_collectionView selectionIndexes]];
+
+    [ac insertObject:4 atArrangedObjectIndex:2];
+    [self assert:[CPIndexSet indexSetWithIndex:2] equals:[_collectionView selectionIndexes]];
+
+    // collection view selection is reflected on the array controller selection
+    [_collectionView setSelectionIndexes:[CPIndexSet indexSetWithIndex:0]];
+    [self assert:[CPIndexSet indexSetWithIndex:0] equals:[ac selectionIndexes]];
+
+    // collection view content is reflected on the array controller content
+    //[_collectionView setContent:[8,9]];
+    //[self assert:[8,9] equals:[ac content]];
+}
+
 - (void)testSetContentAndSelectionIndexes
 {
     // Changing the content does not automatically clear the selection indexes. The previous

Tests/AppKit/CPPopUpButtonTest.j

@@ -324,6 +324,36 @@
     [self assert:2 equals:[[self button] indexOfSelectedItem]];
 }
 
+- (void)testSimpleObjectBindingArrayControllerWithLateContent
+{
+    var arrayController = [[CPArrayController alloc] init],
+        objectController = [[CPObjectController alloc] init],
+        testObject = [CPMutableDictionary dictionary],
+        martin = [CPDictionary dictionaryWithJSObject:{@"name": @"Martin"}],
+        malte = [CPDictionary dictionaryWithJSObject:{@"name": @"Malte"}],
+        johan = [CPDictionary dictionaryWithJSObject:{@"name": @"Johan"}],
+        menuObjects = [martin, malte, johan];
+
+    [testObject setObject:@"I'm a testObject" forKey:@"Who am I"];
+    [objectController setContent:testObject];
+
+    [button bind:CPContentBinding toObject:arrayController withKeyPath:@"arrangedObjects" options:nil];
+    [button bind:CPContentValuesBinding toObject:arrayController withKeyPath:@"arrangedObjects.name" options:nil];
+    [button bind:CPSelectedObjectBinding toObject:objectController withKeyPath:@"selection.xxx" options:nil];
+
+    [testObject setObject:martin forKey:@"xxx"];
+    [arrayController setContent:menuObjects];
+    [self assert:0 equals:[[self button] indexOfSelectedItem]];
+    [arrayController setContent:nil];
+    [testObject setObject:malte forKey:@"xxx"];
+    [arrayController setContent:menuObjects];
+    [self assert:1 equals:[[self button] indexOfSelectedItem]];
+    [arrayController setContent:nil];
+    [testObject setObject:johan forKey:@"xxx"];
+    [arrayController setContent:menuObjects];
+    [self assert:2 equals:[[self button] indexOfSelectedItem]];
+}
+
 - (void)testObjectBindingNullPlaceholderOption
 {
     var arrayController = [[CPArrayController alloc] init],

Tests/AppKit/CPPredicateEditorTest.j

@@ -57,4 +57,31 @@
     }
 }
 
+- (void)testObjectValueWithRightWildcard
+{
+    [self _testAttribute:CPDateAttributeType value:[CPDate date]];
+    [self _testAttribute:CPInteger16AttributeType value:2.0];
+    [self _testAttribute:CPDoubleAttributeType value:2.5];
+    [self _testAttribute:CPFloatAttributeType value:2.5];
+    [self _testAttribute:CPStringAttributeType value:@"toto"];
+    [self _testAttribute:CPBooleanAttributeType value:1];
+}
+
+- (void)_testAttribute:(int)attr value:(id)value
+{
+    var leftExp = [CPExpression expressionForKeyPath:@"keypath"],
+        rightExp = [CPExpression expressionForConstantValue:value],
+        predicate = [CPComparisonPredicate predicateWithLeftExpression:leftExp rightExpression:rightExp modifier:0 type:CPEqualToPredicateOperatorType options:0],
+        compound = [[CPCompoundPredicate alloc] initWithType:CPAndPredicateType subpredicates:@[predicate]];
+
+    var t1 = [[CPPredicateEditorRowTemplate alloc] initWithCompoundTypes:[0,1,2]],
+        t2 = [[CPPredicateEditorRowTemplate alloc] initWithLeftExpressions:@[leftExp] rightExpressionAttributeType:attr modifier:0 operators:@[CPEqualToPredicateOperatorType] options:0];
+
+    [_editor setRowTemplates:@[t1, t2]];
+
+    [_editor setObjectValue:compound];
+    [_editor reloadPredicate];
+    [self assert:compound equals:[_editor objectValue]];
+}
+
 @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/AppKit/CPViewControllerTest.j

@@ -0,0 +1,89 @@
+@import <AppKit/CPViewController.j>
+@import <AppKit/CPApplication.j>
+
+var methodsCalled;
+
+@implementation CPViewControllerTest : OJTestCase
+{
+    CPBundle bundle;
+}
+
+- (void)setUp
+{
+    bundle = [CPBundle bundleWithPath:@"Tests/AppKit/BundleTest"];
+    [bundle loadWithDelegate:self];
+}
+
+- (void)bundleDidFinishLoading:(CPBundle)aBundle
+{
+
+}
+
+- (void)testViewControllerCallbacks
+{
+    methodsCalled = @[];
+
+    var expectedResult = @[@"viewDidLoad",
+                           @"viewWillAppear",
+                           @"viewDidAppear",
+                           @"viewWillDisappear",
+                           @"viewDidDisappear"];
+
+    [self assertTrue:[bundle isLoaded]];
+    var viewController = [[ViewController alloc] initWithCibName:@"NSViewController.cib" bundle:bundle];
+    [self assertNotNull:viewController];
+
+    var superview = [[CPView  alloc] initWithFrame:CGRectMakeZero()];
+    var view = [viewController view];
+
+    [superview addSubview:view];
+    [view removeFromSuperview];
+    [self assert:expectedResult equals:methodsCalled];
+
+    // Explicitely change the view.
+    methodsCalled = [];
+    expectedResult = @[@"viewWillAppear",
+                       @"viewDidAppear",
+                       @"viewWillDisappear",
+                       @"viewDidDisappear"];
+
+    var newView = [[CPView alloc] initWithFrame:CGRectMake(0,0,100,100)];
+    [viewController setView:newView];
+
+    [superview addSubview:newView];
+    [newView removeFromSuperview];
+    // Checks that with receive notifs from the new view and not from the old view.
+    [self assert:expectedResult equals:methodsCalled];
+}
+
+@end
+
+@implementation ViewController : CPViewController
+{
+}
+
+- (void)viewDidLoad
+{
+    [methodsCalled addObject:_cmd];
+}
+
+- (void)viewDidAppear
+{
+    [methodsCalled addObject:_cmd];
+}
+
+- (void)viewWillAppear
+{
+    [methodsCalled addObject:_cmd];
+}
+
+- (void)viewDidDisappear
+{
+    [methodsCalled addObject:_cmd];
+}
+
+- (void)viewWillDisappear
+{
+    [methodsCalled addObject:_cmd];
+}
+@end

Tests/AppKit/CPViewTest.j

@@ -895,70 +895,184 @@ var updateTrackingAreasCalls,
     [self assert:nil equals:[view effectiveAppearance]];
 }
 
+- (void)testViewDidHideDidUnhide
+{
+    var expectedResult = [@"viewDidHide_view1", @"viewDidUnhide_view1"];
+
+    [view1 setHidden:YES];
+    [view1 setHidden:NO];
+
+    [self assert:expectedResult equals:methodCalled];
+}
+
+- (void)testAddViewRemoveView
+{
+    var expectedResult = [@"viewWillMoveToSuperview_view2",
+    @"viewDidMoveToSuperview_view2",
+    @"viewWillMoveToSuperview_view2",
+    @"viewDidMoveToSuperview_view2",
+    @"viewWillMoveToWindow_view2",
+    @"viewDidMoveToWindow_view2"];
+
+    [view1 addSubview:view2];
+    [view2 removeFromSuperview];
+
+    [self assert:expectedResult equals:methodCalled];
+}
+
+- (void)testViewGainedHiddenAncestor
+{
+    var expectedResult = [@"viewDidHide_view1",
+    @"viewWillMoveToSuperview_view3",
+    @"viewDidMoveToSuperview_view3",
+    @"viewWillMoveToSuperview_view2",
+    @"viewDidHide_view2",
+    @"viewDidHide_view3",
+    @"viewDidMoveToSuperview_view2"];
+
+    [view1 setHidden:YES];
+    [view2 addSubview:view3];
+    CPLog.warn("will add view2");
+    [view1 addSubview:view2];
+
+    [self assertTrue: [view2 isHiddenOrHasHiddenAncestor] message:@"Expected " + [view2 identifier] + "isHiddenOrHasHiddenAncestor = YES"];
+    [self assertTrue: [view3 isHiddenOrHasHiddenAncestor] message:@"Expected isHiddenOrHasHiddenAncestor = YES"];
+
+    [self assertFalse:[view2 isHidden]];
+    [self assertFalse:[view3 isHidden]];
+
+    [self assert:expectedResult equals:methodCalled];
+}
+
+- (void)testRemoveViewsHiddenByAncestor
+{
+    var expectedResult = @[
+    @"viewWillMoveToSuperview_view2",
+    @"viewDidUnhide_view2",
+    @"viewDidUnhide_view3",
+    @"viewDidMoveToSuperview_view2",
+    @"viewWillMoveToWindow_view2",
+    @"viewWillMoveToWindow_view3",
+    @"viewDidMoveToWindow_view3",
+    @"viewDidMoveToWindow_view2"
+];
+
+    [view1 setHidden:YES];
+    [view1 addSubview:view2];
+    [view2 addSubview:view3];
+
+    [self assertTrue: [view2 isHiddenOrHasHiddenAncestor] message:@"Expected isHiddenOrHasHiddenAncestor = YES" ];
+    [self assertFalse:[view2 isHidden]];
+
+    [self assertTrue: [view3 isHiddenOrHasHiddenAncestor] message:@"Expected isHiddenOrHasHiddenAncestor = YES" ];
+    [self assertFalse:[view3 isHidden]];
+
+    methodCalled = [];
+
+    [view2 removeFromSuperview];
+
+    [self assertFalse: [view2 isHiddenOrHasHiddenAncestor] message:@"Expected isHiddenOrHasHiddenAncestor = NO" ];
+    [self assertFalse: [view3 isHiddenOrHasHiddenAncestor] message:@"Expected isHiddenOrHasHiddenAncestor = NO" ];
+
+    [self assert:expectedResult equals:methodCalled];
+}
+
+- (void)testRemoveHiddenView
+{
+    var expectedResult = [@"viewWillMoveToSuperview_view2",    @"viewDidMoveToSuperview_view2",    @"viewWillMoveToWindow_view2",    @"viewDidMoveToWindow_view2"];
+
+    [view1 addSubview:view2];
+    [view2 setHidden:YES];
+
+    methodCalled = [];
+
+    [view2 removeFromSuperview];
+    [self assertTrue: [view2 isHiddenOrHasHiddenAncestor] message:@"Expected isHiddenOrHasHiddenAncestor = YES" ];
+    [self assert:expectedResult equals:methodCalled];
+}
+
+- (void)testLostHiddenAncestorAfterMovingToNewSuperview
+{
+    var expectedResult = @[
+    @"viewWillMoveToSuperview_view2",
+    @"viewDidMoveToSuperview_view2",
+    @"viewDidHide_view1",
+    @"viewDidHide_view2",
+    @"viewWillMoveToSuperview_view2",
+    @"viewDidUnhide_view2",
+    @"viewDidMoveToSuperview_view2"
+];
+
+    [view1 addSubview:view2];
+    [view1 setHidden:YES];
+    [view3 addSubview:view2];
+
+    [self assert:expectedResult equals:methodCalled];
+}
 // TrackingAreaAdditions
 
 - (void)testTrackingAreas
 {
     var trackingArea = [[CPTrackingArea alloc] initWithRect:CGRectMakeZero() options:CPTrackingMouseEnteredAndExited | CPTrackingActiveInKeyWindow | CPTrackingInVisibleRect owner:self userInfo:nil];
-    
+
     [self assert:0 equals:[[view trackingAreas] count] message:@"Initially, a view has no tracking area"];
 
     //
-    
+
     [view addTrackingArea:trackingArea];
     [self assert:1 equals:[[view trackingAreas] count] message:@"After adding a tracking area"];
     [self assert:view equals:[trackingArea view] message:@"Tracking area should be linked to view"];
 
     //
-    
+
     [view removeTrackingArea:trackingArea];
     [self assert:0 equals:[[view trackingAreas] count] message:@"After removing the only tracking area"];
     [self assert:nil equals:[trackingArea view] message:@"Tracking area should be unlinked"];
-    
+
     //
-    
+
     [view addTrackingArea:trackingArea];
     [view addTrackingArea:trackingArea];
     [view addTrackingArea:trackingArea];
     [self assert:1 equals:[[view trackingAreas] count] message:@"Adding the same tracking area multiple times should add it once"];
     [self assert:view equals:[trackingArea view] message:@"Tracking area should be linked to view"];
-    
+
     var trackingArea2 = [[CPTrackingArea alloc] initWithRect:CGRectMakeZero() options:CPTrackingMouseEnteredAndExited | CPTrackingActiveInKeyWindow owner:self userInfo:nil];
 
     //
-    
+
     [view addTrackingArea:trackingArea2];
     [self assert:2 equals:[[view trackingAreas] count] message:@"After adding a second tracking area"];
     [self assert:view equals:[trackingArea2 view] message:@"Tracking area should be linked to view"];
 
     //
-    
+
     [view removeAllTrackingAreas];
     [self assert:0 equals:[[view trackingAreas] count] message:@"After removing all tracking areas"];
     [self assert:nil equals:[trackingArea view] message:@"Tracking area should be unlinked"];
     [self assert:nil equals:[trackingArea2 view] message:@"Tracking area should be unlinked"];
 
     //
-    
+
     [view addTrackingArea:trackingArea];
-    
+
     var contentView = [window contentView];
 
     [contentView addSubview:view];
     [self assert:0 equals:updateTrackingAreasCalls message:@"Putting a view with a CPTrackingAreaInVisibleRect in a window should not call updateTrackingAreas"];
-    
+
     [view removeFromSuperview];
 
     //
-    
+
     [view addTrackingArea:trackingArea2];
     [contentView addSubview:view];
     [self assert:1 equals:updateTrackingAreasCalls message:@"Putting a view with a non CPTrackingAreaInVisibleRect in a window should call updateTrackingAreas"];
-    
+
     [view removeAllTrackingAreas];
-    
+
     //
-    
+
     var viewTA = [[CPTrackingAreaView alloc] initWithFrame:CGRectMakeZero()];
     updateTrackingAreasCalls = 0;
 
@@ -966,17 +1080,17 @@ var updateTrackingAreasCalls,
     [self assert:1 equals:updateTrackingAreasCalls message:@"Putting a view with no tracking areas in a window should call updateTrackingAreas"];
 
     //
-    
+
     updateTrackingAreasCalls = 0;
 
     [viewTA addTrackingArea:trackingArea];
     [viewTA setFrame:CGRectMake(10, 10, 10, 10)];
     [self assert:0 equals:updateTrackingAreasCalls message:@"Changing geometry of a view with a CPTrackingAreaInVisibleRect should not call updateTrackingAreas"];
-    
+
     //
-    
+
     updateTrackingAreasCalls = 0;
-    
+
     [viewTA addTrackingArea:trackingArea2];
     [viewTA setFrame:CGRectMake(20, 20, 20, 20)];
     [self assert:1 equals:updateTrackingAreasCalls message:@"Changing geometry of a view with a non CPTrackingAreaInVisibleRect should call updateTrackingAreas"];
@@ -1048,7 +1162,7 @@ var updateTrackingAreasCalls,
 
     [viewTA removeAllTrackingAreas];
     [viewTA addTrackingArea:trackingAreaAllWithDrag];
-    
+
     // Mouse enters the tracking area while dragging (option set)
 
     [self moveMouseAtPoint:CGPointMake(21, 21) dragging:YES];
@@ -1103,7 +1217,7 @@ var updateTrackingAreasCalls,
     [self assert:0 equals:mouseExitedCalls  message:@"Mouse entering inner tracking area should not call mouseExited"];
     [self assert:1 equals:mouseMovedCalls   message:@"Mouse entering inner tracking area should call mouseMoved"];
     [self assert:1 equals:cursorUpdateCalls message:@"Mouse entering inner tracking area should call cursorUpdate"];
-    
+
     // Mouse moves in inner view
 
     [self moveMouseAtPoint:CGPointMake(27, 27) dragging:NO];
@@ -1112,7 +1226,7 @@ var updateTrackingAreasCalls,
     [self assert:0 equals:mouseExitedCalls  message:@"Mouse moving in inner tracking area should not call mouseExited"];
     [self assert:2 equals:mouseMovedCalls   message:@"Mouse moving in inner tracking area should call mouseMoved for both views"];
     [self assert:0 equals:cursorUpdateCalls message:@"Mouse moving in inner tracking area should not call cursorUpdate"];
-    
+
     // Mouse leaves inner view but remains in outer view
 
     [self moveMouseAtPoint:CGPointMake(36, 36) dragging:NO];
@@ -1121,7 +1235,7 @@ var updateTrackingAreasCalls,
     [self assert:1 equals:mouseExitedCalls  message:@"Mouse moving from inner to outer tracking area should call mouseExited (for inner)"];
     [self assert:1 equals:mouseMovedCalls   message:@"Mouse moving from inner to outer tracking area should call mouseMoved (for outer)"];
     [self assert:1 equals:cursorUpdateCalls message:@"Mouse moving from inner to outer tracking area should call cursorUpdate (for outer)"];
-    
+
     [self assert:innerViewTA equals:involvedViewForMouseExited  message:@"Inner view should receive mouseExited"];
     [self assert:viewTA      equals:involvedViewForCursorUpdate message:@"Outer view should receive cursorUpdate"];
 
@@ -1278,7 +1392,7 @@ var updateTrackingAreasCalls,
     [self mouseUpAtPoint:CGPointMake(10, 10)];
 
     [self assert:[CPCursor arrowCursor] equals:[CPCursor currentCursor] message:@"Step 1.7 : cursor should be an arrow"];
-    
+
     //
 
     [self moveMouseAtPoint:CGPointMake(1, 1) dragging:NO];
@@ -1292,7 +1406,7 @@ var updateTrackingAreasCalls,
     [self moveMouseAtPoint:CGPointMake(5, 5) dragging:NO];
 
     [self assert:[CPCursor arrowCursor] equals:[CPCursor currentCursor] message:@"Step 2.1 : cursor should be an arrow"];
-    
+
     // Step 2.2 : inside the superview / outside the subview
 
     [self moveMouseAtPoint:CGPointMake(15, 15) dragging:NO];
@@ -1310,7 +1424,7 @@ var updateTrackingAreasCalls,
     [self moveMouseAtPoint:CGPointMake(15, 15) dragging:NO];
 
     [self assert:[CPCursor crosshairCursor] equals:[CPCursor currentCursor] message:@"Step 2.4 : cursor should be a crosshair"];
-    
+
     // Step 2.5 : outside the superview
 
     [self moveMouseAtPoint:CGPointMake(5, 5) dragging:NO];
@@ -1355,14 +1469,14 @@ var updateTrackingAreasCalls,
     [self moveMouseAtPoint:CGPointMake(5, 5) dragging:NO];
 
     [self assert:[CPCursor arrowCursor] equals:[CPCursor currentCursor] message:@"Step 3.5 : cursor should be an arrow"];
-    
+
 }
 
 - (void)testTrackingAreasLiveViewHierarchyModification
 {
     // 1. viewB inside viewA with mouseEntered removing itself
 
-    var viewA = [[CPTrackingAreaViewWithCursorUpdate alloc] initWithFrame:CGRectMake(20, 20, 40, 40)]
+    var viewA = [[CPTrackingAreaViewWithCursorUpdate alloc] initWithFrame:CGRectMake(20, 20, 40, 40)],
         viewB = [[CPTrackingAreaViewLiveRemoval      alloc] initWithFrame:CGRectMake(10, 10, 20, 20)];
 
     [[window contentView] setSubviews:[CPArray arrayWithObject:viewA]];
@@ -1691,6 +1805,18 @@ var updateTrackingAreasCalls,
     [methodCalled addObject:string];
 }
 
+- (void)viewDidUnhide
+{
+    var string = _cmd + @"_" + [self identifier];
+    [methodCalled addObject:string];
+}
+
+- (void)viewDidHide
+{
+    var string = _cmd + @"_" + [self identifier];
+    [methodCalled addObject:string];
+}
+
 - (BOOL)acceptsFirstResponder
 {
     return YES;

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>