diff --git a/.clang-format b/.clang-format
new file mode 100644
index 0000000..55e8236
--- /dev/null
+++ b/.clang-format
@@ -0,0 +1,53 @@
+---
+Language: Cpp
+# BasedOnStyle: WebKit
+AccessModifierOffset: -4
+ConstructorInitializerIndentWidth: 4
+AlignEscapedNewlinesLeft: false
+AlignTrailingComments: false
+AllowAllParametersOfDeclarationOnNextLine: true
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: All
+AlwaysBreakTemplateDeclarations: false
+AlwaysBreakBeforeMultilineStrings: false
+BreakBeforeBinaryOperators: true
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: true
+BinPackParameters: true
+ColumnLimit: 0
+ConstructorInitializerAllOnOneLineOrOnePerLine: false
+DerivePointerBinding: false
+ExperimentalAutoDetectBinPacking: false
+IndentCaseLabels: false
+MaxEmptyLinesToKeep: 2
+KeepEmptyLinesAtTheStartOfBlocks: true
+NamespaceIndentation: Inner
+ObjCSpaceAfterProperty: true
+ObjCSpaceBeforeProtocolList: true
+PenaltyBreakBeforeFirstCallParameter: 19
+PenaltyBreakComment: 300
+PenaltyBreakString: 1000
+PenaltyBreakFirstLessLess: 120
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 60
+PointerBindsToType: true
+SpacesBeforeTrailingComments: 1
+Cpp11BracedListStyle: false
+Standard: Cpp03
+IndentWidth: 8
+TabWidth: 8
+UseTab: Never
+BreakBeforeBraces: Stroustrup
+IndentFunctionDeclarationAfterType: false
+SpacesInParentheses: false
+SpacesInAngles: false
+SpaceInEmptyParentheses: false
+SpacesInCStyleCastParentheses: false
+SpacesInContainerLiterals: true
+SpaceBeforeAssignmentOperators: true
+ContinuationIndentWidth: 20
+CommentPragmas: '^ IWYU pragma:'
+ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ]
+SpaceBeforeParens: ControlStatements
+...
diff --git a/F-Script 10.9 copy-Info.plist b/F-Script 10.9 copy-Info.plist
new file mode 100644
index 0000000..a9898a5
--- /dev/null
+++ b/F-Script 10.9 copy-Info.plist
@@ -0,0 +1,109 @@
+
+
+
+
+ CFBundleDevelopmentRegion
+ English
+ CFBundleExecutable
+ F-Script
+ CFBundleGetInfoString
+
+ CFBundleIconFile
+ fs.icns
+ CFBundleIdentifier
+ $(PRODUCT_BUNDLE_IDENTIFIER)
+ CFBundleInfoDictionaryVersion
+ 6.0
+ CFBundleName
+ F-Script
+ CFBundlePackageType
+ APPL
+ CFBundleShortVersionString
+ 2.2
+ CFBundleSignature
+ ????
+ CFBundleVersion
+ 2.2
+ LSEnvironment
+
+ NSAppleScriptEnabled
+ YES
+ NSHumanReadableCopyright
+ Copyright © 1998-2010 Philippe Mougin.
+ NSMainNibFile
+ fs.nib
+ NSPrincipalClass
+ NSApplication
+ NSServices
+
+
+ NSMenuItem
+
+ default
+ F-Script/Execute Selection
+
+ NSMessage
+ execute
+ NSPortName
+ F-Script
+ NSReturnTypes
+
+ NSStringPboardType
+
+ NSSendTypes
+
+ NSStringPboardType
+
+
+
+ NSMenuItem
+
+ default
+ F-Script/View/Put Command
+
+ NSMessage
+ putCommand
+ NSPortName
+ F-Script
+ NSSendTypes
+
+ NSStringPboardType
+
+
+
+ NSMenuItem
+
+ default
+ F-Script/View/Put Command (Ret=execute)
+
+ NSMessage
+ putCommand
+ NSPortName
+ F-Script
+ NSSendTypes
+
+ NSStringPboardType
+
+ NSUserData
+ DECOMPOSE
+
+
+ NSMenuItem
+
+ default
+ F-Script/View/Put Command (Ret=newline)
+
+ NSMessage
+ putCommand
+ NSPortName
+ F-Script
+ NSSendTypes
+
+ NSStringPboardType
+
+ NSUserData
+ NO_DECOMPOSE
+
+
+
+
diff --git a/F-Script/DemoAssistant.xib b/F-Script/DemoAssistant.xib
index 8e6b7ca..6db3858 100644
--- a/F-Script/DemoAssistant.xib
+++ b/F-Script/DemoAssistant.xib
@@ -1,2976 +1,782 @@
-
-
-
- 1060
- 12C54
- 2844
- 1187.34
- 625.00
-
-
- NSBox
- NSButton
- NSButtonCell
- NSCustomObject
- NSScrollView
- NSScroller
- NSTextField
- NSTextFieldCell
- NSTextView
- NSView
- NSWindowTemplate
-
-
- com.apple.InterfaceBuilder.CocoaPlugin
-
-
-
-
-
-
-
-
-
-
-
-
-
- 0
- IBCocoaFramework
-
-
- YES
- 3
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ perspectiveFilter := CIFilter filterWithName:'CIPerspectiveTransform'.
+
+perspectiveFilter setValue:(CIVector vectorWithX:500 Y:1000) forKey:'inputTopLeft'.
+perspectiveFilter setValue:(CIVector vectorWithX:2000 Y:1000) forKey:'inputTopRight'.
+perspectiveFilter setValue:(CIVector vectorWithX:2560 Y:0) forKey:'inputBottomRight'.
+perspectiveFilter setValue:(CIVector vectorWithX:0 Y:0) forKey:'inputBottomLeft'.
+perspectiveFilter setValue:image forKey:'inputImage'.
+
+perspectiveImage := perspectiveFilter valueForKey:'outputImage'.
+perspectiveImage drawInRect:(150<>200 extent:600<>400) fromRect:image extent operation:NSCompositeSourceOver fraction:1.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ hueFilter := CIFilter filterWithName:'CIHueAdjust'.
+
+hueFilter setValue:2.5 forKey:'inputAngle'.
+hueFilter setValue:image forKey:'inputImage'.
+
+hueImage := hueFilter valueForKey:'outputImage'.
+hueImage drawInRect:(150<>200 extent:600<>400) fromRect:image extent operation:NSCompositeSourceOver fraction:1.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ bumpFilter := CIFilter filterWithName:'CIBumpDistortion'.
+
+vector := CIVector vectorWithX:1200 Y:800.
+
+bumpFilter setValue:vector forKey:'inputCenter'.
+bumpFilter setValue:900 forKey:'inputRadius'.
+bumpFilter setValue:0.8 forKey:'inputScale'.
+
+bumpFilter setValue:image forKey:'inputImage'.
+bumpImage := bumpFilter valueForKey:'outputImage'.
+bumpImage drawInRect:(150<>200 extent:600<>400) fromRect:bumpImage extent operation:NSCompositeSourceOver fraction:1.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ bumpFilter := CIFilter filterWithName:'CIBumpDistortion'.
+bumpFilter setValue:900 forKey:'inputRadius'.
+bumpFilter setValue:0.8 forKey:'inputScale'.
+bumpFilter setValue:image forKey:'inputImage'.
+
+keyWindow := NSApplication sharedApplication keyWindow.
+rect := (150<>200 extent:600<>400).
+
+0 to:2500 by:5 do:
+[:i|
+ bumpFilter setValue:(CIVector vectorWithX:i Y:700) forKey:'inputCenter'.
+ bumpedImage := bumpFilter valueForKey:'outputImage'.
+ bumpedImage drawInRect:rect fromRect:image extent operation:NSCompositeSourceOver fraction:1.
+ keyWindow flushWindow.
+]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Horloge : NSObject
+{
+ textField
+
+ - update:sender
+ {
+ textField setObjectValue:NSDate date
+ }
+
+ - setTextField:theTextField
+ {
+ textField := theTextField
+ }
+}.
+
+NSBundle loadNibFile:'/Users/pmougin/Desktop/Sample/build/Debug/Sample.app/Contents/Resources/English.lproj/MainMenu.nib' externalNameTable:nil withZone:nil
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ iTunes isRunning ifTrue:
+[
+ |rampVolume originalVolume|
+
+ originalVolume := iTunes soundVolume.
+ iTunes play:nil once:NO.
+ rampVolume := originalVolume.
+
+ [rampVolume > 0] whileTrue:
+ [
+ iTunes setSoundVolume:rampVolume.
+ "Pause 1/10th of a second between adjustments"
+ NSThread sleepUntilDate:(NSDate dateWithTimeIntervalSinceNow:0.2).
+ rampVolume := rampVolume - (originalVolume / 32).
+ ].
+
+
+ [rampVolume < originalVolume] whileTrue:
+ [
+ iTunes setSoundVolume:rampVolume.
+ "Pause 1/10th of a second between adjustments"
+ NSThread sleepUntilDate:(NSDate dateWithTimeIntervalSinceNow:0.2).
+ rampVolume := rampVolume + (originalVolume / 32).
+ ].
+
+ iTunes setSoundVolume:originalVolume.
+]
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/F-Script/English.lproj/fs.nib/classes.nib b/F-Script/English.lproj/fs.nib/classes.nib
deleted file mode 100644
index bb4a953..0000000
--- a/F-Script/English.lproj/fs.nib/classes.nib
+++ /dev/null
@@ -1,161 +0,0 @@
-
-
-
-
- IBClasses
-
-
- CLASS
- FSInterpreterView
- LANGUAGE
- ObjC
- OUTLETS
-
- object1
- id
- object2
- id
- object3
- id
- object4
- id
- object5
- id
- object6
- id
- object7
- id
- object8
- id
- object9
- id
-
- SUPERCLASS
- NSView
-
-
- CLASS
- NSObject
- LANGUAGE
- ObjC
-
-
- ACTIONS
-
- executeCurrentCommand
- id
- moveDown
- id
- moveLeft
- id
- moveToBeginningOfLine
- id
- moveToBeginningOfParagraph
- id
- moveToEndOfLine
- id
- moveToEndOfParagraph
- id
- moveUp
- id
- parenthesizeCommand
- id
- paste
- id
- saveEditedCommand
- id
- switchParserMode
- id
-
- CLASS
- ShellView
- LANGUAGE
- ObjC
- OUTLETS
-
- commandHandler
- id
-
- SUPERCLASS
- FScriptTextView
-
-
- ACTIONS
-
- enterSelection
- id
- findNext
- id
- findPrevious
- id
- newBigBrowser
- id
- orderFrontFindPanel
- id
-
- CLASS
- FirstResponder
- LANGUAGE
- ObjC
- SUPERCLASS
- NSObject
-
-
- CLASS
- FScriptTextView
- LANGUAGE
- ObjC
- SUPERCLASS
- NSTextView
-
-
- ACTIONS
-
- newDemoAssistant
- id
- newKVBrowser
- id
- newObjectBrowser
- id
- showConsole
- id
- showInfoPanel
- id
- showPreferencePanel
- id
- updatePreference
- id
-
- CLASS
- FScriptAppController
- LANGUAGE
- ObjC
- OUTLETS
-
- automaticallyIntrospectDeclaredPropertiesUI
- NSButton
- confirmWhenQuittingUI
- NSButton
- displayObjectBrowserAtLaunchTimeUI
- NSButton
- fontSizeUI
- NSTextField
- infoPanel
- NSPanel
- interpreterView
- FSInterpreterView
- preferencePanel
- NSPanel
- runWithObjCAutomaticGarbageCollectionUI
- NSButton
- shouldJournalUI
- NSButton
-
- SUPERCLASS
- NSObject
-
-
- IBVersion
- 1
-
-
diff --git a/F-Script/English.lproj/fs.nib/info.nib b/F-Script/English.lproj/fs.nib/info.nib
deleted file mode 100644
index 272c224..0000000
--- a/F-Script/English.lproj/fs.nib/info.nib
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
- IBFramework Version
- 677
- IBLastKnownRelativeProjectPath
- ../../FScript.xcodeproj
- IBOldestOS
- 5
- IBOpenObjects
-
- 44
-
- IBSystem Version
- 9J61
- targetFramework
- IBCocoaFramework
-
-
diff --git a/F-Script/English.lproj/fs.nib/keyedobjects.nib b/F-Script/English.lproj/fs.nib/keyedobjects.nib
deleted file mode 100644
index 2dd9594..0000000
Binary files a/F-Script/English.lproj/fs.nib/keyedobjects.nib and /dev/null differ
diff --git a/F-Script/English.lproj/fs.xib b/F-Script/English.lproj/fs.xib
new file mode 100644
index 0000000..e0ab91b
--- /dev/null
+++ b/F-Script/English.lproj/fs.xib
@@ -0,0 +1,3287 @@
+
+
+
+ 1050
+ 14A379a
+ 941
+ 1343.13
+ 755.00
+
+
+
+
+
+
+
+ 0
+ IBCocoaFramework
+
+
+ YES
+ ../../FScript.xcodeproj
+ 3
+
+
+
diff --git a/F-Script/English.lproj/fs~.xib b/F-Script/English.lproj/fs~.xib
new file mode 100644
index 0000000..e2ff1f9
--- /dev/null
+++ b/F-Script/English.lproj/fs~.xib
@@ -0,0 +1,3052 @@
+
+
+
+ 1020
+ 14A379a
+ 941
+ 1343.13
+ 755.00
+
+
+
+
+
+
+
+ 0
+ IBCocoaFramework
+
+
+ YES
+
+ 3
+
+
+
diff --git a/F-Script/FScriptAppPreference.nib/keyedobjects.nib b/F-Script/FScriptAppPreference.nib/keyedobjects.nib
deleted file mode 100644
index 15ee95e..0000000
Binary files a/F-Script/FScriptAppPreference.nib/keyedobjects.nib and /dev/null differ
diff --git a/F-Script/FScriptAppPreference.nib/designable.nib b/F-Script/FScriptAppPreference.xib
similarity index 96%
rename from F-Script/FScriptAppPreference.nib/designable.nib
rename to F-Script/FScriptAppPreference.xib
index 68f3096..d43527f 100644
--- a/F-Script/FScriptAppPreference.nib/designable.nib
+++ b/F-Script/FScriptAppPreference.xib
@@ -2,24 +2,15 @@
1050
- 12C54
- 2840
- 1187.34
- 625.00
+ 14A379a
+ 941
+ 1343.13
+ 755.00
-
- NSButton
- NSButtonCell
- NSCustomObject
- NSNumberFormatter
- NSTextField
- NSTextFieldCell
- NSView
- NSWindowTemplate
-
+
com.apple.InterfaceBuilder.CocoaPlugin
@@ -48,9 +39,10 @@
View
+ {1.7976931348623157e+308, 1.7976931348623157e+308}
{297, 118}
{{0, 0}, {1366, 746}}
{297, 140}
- {10000000000000, 10000000000000}
+ {1.7976931348623157e+308, 1.7976931348623157e+308}
YES