diff options
| author | Johan Paulsson <gonz@users.sourceforge.net> | 2013-01-27 16:54:57 +0000 |
|---|---|---|
| committer | Johan Paulsson <gonz@users.sourceforge.net> | 2013-01-27 16:54:57 +0000 |
| commit | d35a186932e95b979bb947110a2e7d2cca41fcc9 (patch) | |
| tree | c01417f00717afd223a9a2052cfaa809e8de655e | |
| parent | 46d894569372dea8c3e3f698b361f68d6bbebde6 (diff) | |
Better parser errors on syntax errors. Will show line number, description and where the error happened.
Test function for delimited string if they will break reprising.
| -rw-r--r-- | tikzit/English.lproj/PropertyInspector.xib | 995 | ||||
| -rw-r--r-- | tikzit/TikZiT.xcodeproj/project.pbxproj | 14 | ||||
| -rw-r--r-- | tikzit/src/common/TikzGraphAssembler.h | 2 | ||||
| -rw-r--r-- | tikzit/src/common/TikzGraphAssembler.m | 44 | ||||
| -rw-r--r-- | tikzit/src/common/tikzlexer.lm | 60 | ||||
| -rw-r--r-- | tikzit/src/common/tikzparser.ym | 3 |
6 files changed, 535 insertions, 583 deletions
diff --git a/tikzit/English.lproj/PropertyInspector.xib b/tikzit/English.lproj/PropertyInspector.xib index 4ba24a7..91e30c3 100644 --- a/tikzit/English.lproj/PropertyInspector.xib +++ b/tikzit/English.lproj/PropertyInspector.xib @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> +<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00"> <data> <int key="IBDocument.SystemTarget">1070</int> <string key="IBDocument.SystemVersion">12C60</string> @@ -10,8 +10,8 @@ <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="NS.object.0">2844</string> </object> - <object class="NSArray" key="IBDocument.IntegratedClassDependencies"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array key="IBDocument.IntegratedClassDependencies"> + <string>IBCustomFormatter</string> <string>NSArrayController</string> <string>NSBox</string> <string>NSButton</string> @@ -29,17 +29,15 @@ <string>NSTextFieldCell</string> <string>NSView</string> <string>NSWindowTemplate</string> - </object> - <object class="NSArray" key="IBDocument.PluginDependencies"> - <bool key="EncodedWithXMLCoder">YES</bool> + </array> + <array key="IBDocument.PluginDependencies"> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - </object> + </array> <object class="NSMutableDictionary" key="IBDocument.Metadata"> <string key="NS.key.0">PluginDependencyRecalculationVersion</string> <integer value="1" key="NS.object.0"/> </object> - <object class="NSMutableArray" key="IBDocument.RootObjects" id="1000"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="IBDocument.RootObjects" id="1000"> <object class="NSCustomObject" id="1001"> <string key="NSClassName">PropertyInspectorController</string> </object> @@ -62,21 +60,21 @@ <object class="NSView" key="NSWindowView" id="299507146"> <reference key="NSNextResponder"/> <int key="NSvFlags">256</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSSubviews"> <object class="NSCustomView" id="767543822"> <reference key="NSNextResponder" ref="299507146"/> <int key="NSvFlags">274</int> <string key="NSFrameSize">{193, 256}</string> <reference key="NSSuperview" ref="299507146"/> + <reference key="NSNextKeyView"/> <string key="NSClassName">SFBInspectorView</string> </object> - </object> + </array> <string key="NSFrameSize">{193, 256}</string> <reference key="NSSuperview"/> <reference key="NSNextKeyView" ref="767543822"/> </object> - <string key="NSScreenRect">{{0, 0}, {1600, 1200}}</string> + <string key="NSScreenRect">{{0, 0}, {1920, 1200}}</string> <string key="NSMinSize">{200, 246}</string> <string key="NSMaxSize">{10000000000000, 10000000000000}</string> <bool key="NSWindowIsRestorable">YES</bool> @@ -84,24 +82,21 @@ <object class="NSCustomView" id="725040895"> <reference key="NSNextResponder"/> <int key="NSvFlags">268</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSSubviews"> <object class="NSScrollView" id="987989050"> <reference key="NSNextResponder" ref="725040895"/> <int key="NSvFlags">268</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSSubviews"> <object class="NSClipView" id="160409253"> <reference key="NSNextResponder" ref="987989050"/> <int key="NSvFlags">2304</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSSubviews"> <object class="NSTableView" id="555379611"> <reference key="NSNextResponder" ref="160409253"/> <int key="NSvFlags">256</int> <string key="NSFrameSize">{183, 74}</string> <reference key="NSSuperview" ref="160409253"/> - <reference key="NSNextKeyView" ref="61166500"/> + <reference key="NSNextKeyView" ref="969856497"/> <bool key="NSEnabled">YES</bool> <bool key="NSAllowsLogicalLayoutDirection">NO</bool> <bool key="NSControlAllowsExpansionToolTips">YES</bool> @@ -119,8 +114,7 @@ <string key="NSFrame">{{224, 0}, {16, 17}}</string> <reference key="NSNextKeyView" ref="160409253"/> </object> - <object class="NSMutableArray" key="NSTableColumns"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSTableColumns"> <object class="NSTableColumn" id="952219629"> <double key="NSWidth">85</double> <double key="NSMinWidth">40</double> @@ -205,7 +199,7 @@ <bool key="NSIsEditable">YES</bool> <reference key="NSTableView" ref="555379611"/> </object> - </object> + </array> <double key="NSIntercellSpacingWidth">3</double> <double key="NSIntercellSpacingHeight">2</double> <object class="NSColor" key="NSBackgroundColor" id="25166299"> @@ -232,7 +226,7 @@ <int key="NSTableViewDraggingDestinationStyle">0</int> <int key="NSTableViewGroupRowStyle">1</int> </object> - </object> + </array> <string key="NSFrame">{{1, 17}, {183, 74}}</string> <reference key="NSSuperview" ref="987989050"/> <reference key="NSNextKeyView" ref="555379611"/> @@ -245,7 +239,7 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{224, 17}, {15, 102}}</string> <reference key="NSSuperview" ref="987989050"/> - <reference key="NSNextKeyView" ref="969856497"/> + <reference key="NSNextKeyView" ref="480495865"/> <bool key="NSAllowsLogicalLayoutDirection">NO</bool> <reference key="NSTarget" ref="987989050"/> <string key="NSAction">_doScroller:</string> @@ -254,9 +248,9 @@ <object class="NSScroller" id="969856497"> <reference key="NSNextResponder" ref="987989050"/> <int key="NSvFlags">-2147483392</int> - <string key="NSFrame">{{1, 126}, {181, 15}}</string> + <string key="NSFrame">{{1, 75}, {183, 16}}</string> <reference key="NSSuperview" ref="987989050"/> - <reference key="NSNextKeyView" ref="480495865"/> + <reference key="NSNextKeyView" ref="369516133"/> <bool key="NSAllowsLogicalLayoutDirection">NO</bool> <int key="NSsFlags">1</int> <reference key="NSTarget" ref="987989050"/> @@ -266,10 +260,9 @@ <object class="NSClipView" id="61166500"> <reference key="NSNextResponder" ref="987989050"/> <int key="NSvFlags">2304</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSSubviews"> <reference ref="633188190"/> - </object> + </array> <string key="NSFrame">{{1, 0}, {183, 17}}</string> <reference key="NSSuperview" ref="987989050"/> <reference key="NSNextKeyView" ref="633188190"/> @@ -277,10 +270,10 @@ <reference key="NSBGColor" ref="154397349"/> <int key="NScvFlags">4</int> </object> - </object> + </array> <string key="NSFrame">{{4, 31}, {185, 92}}</string> <reference key="NSSuperview" ref="725040895"/> - <reference key="NSNextKeyView" ref="160409253"/> + <reference key="NSNextKeyView" ref="61166500"/> <int key="NSsFlags">133682</int> <reference key="NSVScroller" ref="369516133"/> <reference key="NSHScroller" ref="969856497"/> @@ -325,6 +318,7 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{53, 3}, {26, 26}}</string> <reference key="NSSuperview" ref="725040895"/> + <reference key="NSNextKeyView"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="240925324"> <int key="NSCellFlags">-2080374784</int> @@ -429,7 +423,7 @@ </object> <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> - </object> + </array> <string key="NSFrameSize">{193, 152}</string> <reference key="NSSuperview"/> <reference key="NSNextKeyView" ref="574444329"/> @@ -438,24 +432,21 @@ <object class="NSCustomView" id="1063930747"> <reference key="NSNextResponder"/> <int key="NSvFlags">268</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSSubviews"> <object class="NSScrollView" id="114363066"> <reference key="NSNextResponder" ref="1063930747"/> <int key="NSvFlags">268</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSSubviews"> <object class="NSClipView" id="10985668"> <reference key="NSNextResponder" ref="114363066"/> <int key="NSvFlags">2304</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSSubviews"> <object class="NSTableView" id="280174442"> <reference key="NSNextResponder" ref="10985668"/> <int key="NSvFlags">256</int> <string key="NSFrameSize">{183, 74}</string> <reference key="NSSuperview" ref="10985668"/> - <reference key="NSNextKeyView" ref="442374025"/> + <reference key="NSNextKeyView" ref="878278571"/> <bool key="NSEnabled">YES</bool> <bool key="NSAllowsLogicalLayoutDirection">NO</bool> <bool key="NSControlAllowsExpansionToolTips">YES</bool> @@ -473,8 +464,7 @@ <string key="NSFrame">{{224, 0}, {16, 17}}</string> <reference key="NSNextKeyView" ref="10985668"/> </object> - <object class="NSMutableArray" key="NSTableColumns"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSTableColumns"> <object class="NSTableColumn" id="537051925"> <double key="NSWidth">85</double> <double key="NSMinWidth">40</double> @@ -530,7 +520,7 @@ <bool key="NSIsEditable">YES</bool> <reference key="NSTableView" ref="280174442"/> </object> - </object> + </array> <double key="NSIntercellSpacingWidth">3</double> <double key="NSIntercellSpacingHeight">2</double> <reference key="NSBackgroundColor" ref="25166299"/> @@ -546,7 +536,7 @@ <int key="NSTableViewDraggingDestinationStyle">0</int> <int key="NSTableViewGroupRowStyle">1</int> </object> - </object> + </array> <string key="NSFrame">{{1, 17}, {183, 74}}</string> <reference key="NSSuperview" ref="114363066"/> <reference key="NSNextKeyView" ref="280174442"/> @@ -559,7 +549,7 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{224, 17}, {15, 102}}</string> <reference key="NSSuperview" ref="114363066"/> - <reference key="NSNextKeyView" ref="878278571"/> + <reference key="NSNextKeyView" ref="763774819"/> <bool key="NSAllowsLogicalLayoutDirection">NO</bool> <reference key="NSTarget" ref="114363066"/> <string key="NSAction">_doScroller:</string> @@ -568,9 +558,9 @@ <object class="NSScroller" id="878278571"> <reference key="NSNextResponder" ref="114363066"/> <int key="NSvFlags">-2147483392</int> - <string key="NSFrame">{{1, 126}, {181, 15}}</string> + <string key="NSFrame">{{1, 75}, {183, 16}}</string> <reference key="NSSuperview" ref="114363066"/> - <reference key="NSNextKeyView" ref="763774819"/> + <reference key="NSNextKeyView" ref="16681105"/> <bool key="NSAllowsLogicalLayoutDirection">NO</bool> <int key="NSsFlags">1</int> <reference key="NSTarget" ref="114363066"/> @@ -580,10 +570,9 @@ <object class="NSClipView" id="442374025"> <reference key="NSNextResponder" ref="114363066"/> <int key="NSvFlags">2304</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSSubviews"> <reference ref="741880171"/> - </object> + </array> <string key="NSFrame">{{1, 0}, {183, 17}}</string> <reference key="NSSuperview" ref="114363066"/> <reference key="NSNextKeyView" ref="741880171"/> @@ -591,10 +580,10 @@ <reference key="NSBGColor" ref="154397349"/> <int key="NScvFlags">4</int> </object> - </object> + </array> <string key="NSFrame">{{4, 33}, {185, 92}}</string> <reference key="NSSuperview" ref="1063930747"/> - <reference key="NSNextKeyView" ref="10985668"/> + <reference key="NSNextKeyView" ref="442374025"/> <int key="NSsFlags">133682</int> <reference key="NSVScroller" ref="16681105"/> <reference key="NSHScroller" ref="878278571"/> @@ -610,6 +599,7 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{53, 4}, {26, 26}}</string> <reference key="NSSuperview" ref="1063930747"/> + <reference key="NSNextKeyView"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="934918825"> <int key="NSCellFlags">-2080374784</int> @@ -673,7 +663,7 @@ </object> <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> - </object> + </array> <string key="NSFrameSize">{193, 130}</string> <reference key="NSSuperview"/> <reference key="NSNextKeyView" ref="114363066"/> @@ -682,8 +672,7 @@ <object class="NSCustomView" id="924183072"> <reference key="NSNextResponder"/> <int key="NSvFlags">268</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSSubviews"> <object class="NSComboBox" id="725142441"> <reference key="NSNextResponder" ref="924183072"/> <int key="NSvFlags">268</int> @@ -716,8 +705,7 @@ <bool key="NSEnabled">YES</bool> <bool key="NSAllowsLogicalLayoutDirection">NO</bool> <bool key="NSControlAllowsExpansionToolTips">YES</bool> - <object class="NSMutableArray" key="NSTableColumns"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSTableColumns"> <object class="NSTableColumn"> <double key="NSWidth">10</double> <double key="NSMinWidth">10</double> @@ -750,7 +738,7 @@ <bool key="NSIsResizeable">YES</bool> <reference key="NSTableView" ref="1017409934"/> </object> - </object> + </array> <double key="NSIntercellSpacingWidth">3</double> <double key="NSIntercellSpacingHeight">2</double> <reference key="NSBackgroundColor" ref="154397349"/> @@ -803,8 +791,7 @@ <bool key="NSEnabled">YES</bool> <bool key="NSAllowsLogicalLayoutDirection">NO</bool> <bool key="NSControlAllowsExpansionToolTips">YES</bool> - <object class="NSMutableArray" key="NSTableColumns"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSTableColumns"> <object class="NSTableColumn"> <double key="NSWidth">10</double> <double key="NSMinWidth">10</double> @@ -833,7 +820,7 @@ <bool key="NSIsResizeable">YES</bool> <reference key="NSTableView" ref="117913078"/> </object> - </object> + </array> <double key="NSIntercellSpacingWidth">3</double> <double key="NSIntercellSpacingHeight">2</double> <reference key="NSBackgroundColor" ref="154397349"/> @@ -1000,19 +987,17 @@ <object class="NSScrollView" id="385790439"> <reference key="NSNextResponder" ref="924183072"/> <int key="NSvFlags">268</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSSubviews"> <object class="NSClipView" id="1014547104"> <reference key="NSNextResponder" ref="385790439"/> <int key="NSvFlags">2304</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSSubviews"> <object class="NSTableView" id="755303575"> <reference key="NSNextResponder" ref="1014547104"/> <int key="NSvFlags">256</int> <string key="NSFrameSize">{183, 44}</string> <reference key="NSSuperview" ref="1014547104"/> - <reference key="NSNextKeyView" ref="290050466"/> + <reference key="NSNextKeyView" ref="1039219660"/> <bool key="NSEnabled">YES</bool> <bool key="NSAllowsLogicalLayoutDirection">NO</bool> <bool key="NSControlAllowsExpansionToolTips">YES</bool> @@ -1029,8 +1014,7 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{224, 0}, {16, 17}}</string> </object> - <object class="NSMutableArray" key="NSTableColumns"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSTableColumns"> <object class="NSTableColumn" id="314771163"> <double key="NSWidth">85</double> <double key="NSMinWidth">40</double> @@ -1086,7 +1070,7 @@ <bool key="NSIsEditable">YES</bool> <reference key="NSTableView" ref="755303575"/> </object> - </object> + </array> <double key="NSIntercellSpacingWidth">3</double> <double key="NSIntercellSpacingHeight">2</double> <reference key="NSBackgroundColor" ref="25166299"/> @@ -1102,7 +1086,7 @@ <int key="NSTableViewDraggingDestinationStyle">0</int> <int key="NSTableViewGroupRowStyle">1</int> </object> - </object> + </array> <string key="NSFrame">{{1, 17}, {183, 44}}</string> <reference key="NSSuperview" ref="385790439"/> <reference key="NSNextKeyView" ref="755303575"/> @@ -1115,7 +1099,7 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{224, 17}, {15, 102}}</string> <reference key="NSSuperview" ref="385790439"/> - <reference key="NSNextKeyView" ref="1039219660"/> + <reference key="NSNextKeyView" ref="417977631"/> <bool key="NSAllowsLogicalLayoutDirection">NO</bool> <reference key="NSTarget" ref="385790439"/> <string key="NSAction">_doScroller:</string> @@ -1124,9 +1108,9 @@ <object class="NSScroller" id="1039219660"> <reference key="NSNextResponder" ref="385790439"/> <int key="NSvFlags">-2147483392</int> - <string key="NSFrame">{{1, 126}, {181, 15}}</string> + <string key="NSFrame">{{1, 45}, {183, 16}}</string> <reference key="NSSuperview" ref="385790439"/> - <reference key="NSNextKeyView" ref="417977631"/> + <reference key="NSNextKeyView" ref="695772668"/> <bool key="NSAllowsLogicalLayoutDirection">NO</bool> <int key="NSsFlags">1</int> <reference key="NSTarget" ref="385790439"/> @@ -1136,10 +1120,9 @@ <object class="NSClipView" id="290050466"> <reference key="NSNextResponder" ref="385790439"/> <int key="NSvFlags">2304</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSSubviews"> <reference ref="276248098"/> - </object> + </array> <string key="NSFrame">{{1, 0}, {183, 17}}</string> <reference key="NSSuperview" ref="385790439"/> <reference key="NSNextKeyView" ref="276248098"/> @@ -1147,10 +1130,10 @@ <reference key="NSBGColor" ref="154397349"/> <int key="NScvFlags">4</int> </object> - </object> + </array> <string key="NSFrame">{{4, 37}, {185, 62}}</string> <reference key="NSSuperview" ref="924183072"/> - <reference key="NSNextKeyView" ref="1014547104"/> + <reference key="NSNextKeyView" ref="290050466"/> <int key="NSsFlags">133682</int> <reference key="NSVScroller" ref="695772668"/> <reference key="NSHScroller" ref="1039219660"/> @@ -1164,19 +1147,17 @@ <object class="NSScrollView" id="393903553"> <reference key="NSNextResponder" ref="924183072"/> <int key="NSvFlags">268</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSSubviews"> <object class="NSClipView" id="998119817"> <reference key="NSNextResponder" ref="393903553"/> <int key="NSvFlags">2304</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSSubviews"> <object class="NSTableView" id="384092475"> <reference key="NSNextResponder" ref="998119817"/> <int key="NSvFlags">256</int> <string key="NSFrameSize">{183, 74}</string> <reference key="NSSuperview" ref="998119817"/> - <reference key="NSNextKeyView" ref="868431369"/> + <reference key="NSNextKeyView" ref="401297526"/> <bool key="NSEnabled">YES</bool> <bool key="NSAllowsLogicalLayoutDirection">NO</bool> <bool key="NSControlAllowsExpansionToolTips">YES</bool> @@ -1194,8 +1175,7 @@ <string key="NSFrame">{{224, 0}, {16, 17}}</string> <reference key="NSNextKeyView" ref="998119817"/> </object> - <object class="NSMutableArray" key="NSTableColumns"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSTableColumns"> <object class="NSTableColumn" id="477855207"> <double key="NSWidth">85</double> <double key="NSMinWidth">40</double> @@ -1251,7 +1231,7 @@ <bool key="NSIsEditable">YES</bool> <reference key="NSTableView" ref="384092475"/> </object> - </object> + </array> <double key="NSIntercellSpacingWidth">3</double> <double key="NSIntercellSpacingHeight">2</double> <reference key="NSBackgroundColor" ref="25166299"/> @@ -1267,7 +1247,7 @@ <int key="NSTableViewDraggingDestinationStyle">0</int> <int key="NSTableViewGroupRowStyle">1</int> </object> - </object> + </array> <string key="NSFrame">{{1, 17}, {183, 74}}</string> <reference key="NSSuperview" ref="393903553"/> <reference key="NSNextKeyView" ref="384092475"/> @@ -1280,7 +1260,7 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{224, 17}, {15, 102}}</string> <reference key="NSSuperview" ref="393903553"/> - <reference key="NSNextKeyView" ref="401297526"/> + <reference key="NSNextKeyView" ref="329712707"/> <bool key="NSAllowsLogicalLayoutDirection">NO</bool> <reference key="NSTarget" ref="393903553"/> <string key="NSAction">_doScroller:</string> @@ -1289,9 +1269,9 @@ <object class="NSScroller" id="401297526"> <reference key="NSNextResponder" ref="393903553"/> <int key="NSvFlags">-2147483392</int> - <string key="NSFrame">{{1, 126}, {181, 15}}</string> + <string key="NSFrame">{{1, 75}, {183, 16}}</string> <reference key="NSSuperview" ref="393903553"/> - <reference key="NSNextKeyView" ref="329712707"/> + <reference key="NSNextKeyView" ref="318912502"/> <bool key="NSAllowsLogicalLayoutDirection">NO</bool> <int key="NSsFlags">1</int> <reference key="NSTarget" ref="393903553"/> @@ -1301,10 +1281,9 @@ <object class="NSClipView" id="868431369"> <reference key="NSNextResponder" ref="393903553"/> <int key="NSvFlags">2304</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSSubviews"> <reference ref="879414039"/> - </object> + </array> <string key="NSFrame">{{1, 0}, {183, 17}}</string> <reference key="NSSuperview" ref="393903553"/> <reference key="NSNextKeyView" ref="879414039"/> @@ -1312,10 +1291,10 @@ <reference key="NSBGColor" ref="154397349"/> <int key="NScvFlags">4</int> </object> - </object> + </array> <string key="NSFrame">{{4, 247}, {185, 92}}</string> <reference key="NSSuperview" ref="924183072"/> - <reference key="NSNextKeyView" ref="998119817"/> + <reference key="NSNextKeyView" ref="868431369"/> <int key="NSsFlags">133682</int> <reference key="NSVScroller" ref="318912502"/> <reference key="NSHScroller" ref="401297526"/> @@ -1331,6 +1310,7 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{53, 8}, {26, 26}}</string> <reference key="NSSuperview" ref="924183072"/> + <reference key="NSNextKeyView"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="527874463"> <int key="NSCellFlags">-2080374784</int> @@ -1463,19 +1443,18 @@ </object> <bool key="NSAllowsLogicalLayoutDirection">NO</bool> </object> - </object> + </array> <string key="NSFrameSize">{193, 344}</string> <reference key="NSSuperview"/> <reference key="NSNextKeyView" ref="393903553"/> <string key="NSClassName">NSView</string> </object> <object class="NSArrayController" id="155693011"> - <object class="NSMutableArray" key="NSDeclaredKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSDeclaredKeys"> <string>key</string> <string>value</string> <string>isAtom</string> - </object> + </array> <string key="NSObjectClassName">Property</string> <bool key="NSEditable">YES</bool> <object class="_NSManagedProxy" key="_NSManagedProxy"/> @@ -1486,12 +1465,11 @@ <bool key="NSClearsFilterPredicateOnInsertion">YES</bool> </object> <object class="NSArrayController" id="785464170"> - <object class="NSMutableArray" key="NSDeclaredKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSDeclaredKeys"> <string>key</string> <string>value</string> <string>isAtom</string> - </object> + </array> <string key="NSObjectClassName">Property</string> <bool key="NSEditable">YES</bool> <object class="_NSManagedProxy" key="_NSManagedProxy"/> @@ -1502,12 +1480,11 @@ <bool key="NSClearsFilterPredicateOnInsertion">YES</bool> </object> <object class="NSArrayController" id="97510786"> - <object class="NSMutableArray" key="NSDeclaredKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSDeclaredKeys"> <string>key</string> <string>value</string> <string>isAtom</string> - </object> + </array> <string key="NSObjectClassName">Property</string> <bool key="NSEditable">YES</bool> <object class="_NSManagedProxy" key="_NSManagedProxy"/> @@ -1518,12 +1495,11 @@ <bool key="NSClearsFilterPredicateOnInsertion">YES</bool> </object> <object class="NSArrayController" id="852813361"> - <object class="NSMutableArray" key="NSDeclaredKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSDeclaredKeys"> <string>key</string> <string>value</string> <string>isAtom</string> - </object> + </array> <string key="NSObjectClassName">Property</string> <bool key="NSEditable">YES</bool> <object class="_NSManagedProxy" key="_NSManagedProxy"/> @@ -1534,10 +1510,9 @@ <bool key="NSClearsFilterPredicateOnInsertion">YES</bool> </object> <object class="NSArrayController" id="238023931"> - <object class="NSMutableArray" key="NSDeclaredKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSDeclaredKeys"> <string>label</string> - </object> + </array> <string key="NSObjectClassName">Node</string> <bool key="NSEditable">YES</bool> <object class="_NSManagedProxy" key="_NSManagedProxy"/> @@ -1548,10 +1523,9 @@ <bool key="NSClearsFilterPredicateOnInsertion">YES</bool> </object> <object class="NSArrayController" id="146523955"> - <object class="NSMutableArray" key="NSDeclaredKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="NSDeclaredKeys"> <string>edgeNode</string> - </object> + </array> <string key="NSObjectClassName">Edge</string> <bool key="NSEditable">YES</bool> <object class="_NSManagedProxy" key="_NSManagedProxy"/> @@ -1613,10 +1587,10 @@ <bool key="NSFilterRestrictsInsertion">YES</bool> <bool key="NSClearsFilterPredicateOnInsertion">YES</bool> </object> - </object> + <object class="IBCustomFormatter" id="472611652"/> + </array> <object class="IBObjectContainer" key="IBDocument.Objects"> - <object class="NSMutableArray" key="connectionRecords"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="connectionRecords"> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> <string key="label">nodePropertiesView</string> @@ -1876,25 +1850,24 @@ <string key="NSLabel">value: selection.label</string> <string key="NSBinding">value</string> <string key="NSKeyPath">selection.label</string> - <object class="NSDictionary" key="NSOptions"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSMultipleValuesPlaceholder</string> - <string>NSValueTransformerName</string> - </object> - <object class="NSArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>Multiple Values</string> - <string>NilToEmptyStringTransformer</string> - </object> - </object> + <dictionary key="NSOptions"> + <string key="NSMultipleValuesPlaceholder">Multiple Values</string> + <string key="NSValueTransformerName">NilToEmptyStringTransformer</string> + </dictionary> <int key="NSNibBindingConnectorVersion">2</int> </object> </object> <int key="connectionID">644</int> </object> <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">formatter</string> + <reference key="source" ref="924106352"/> + <reference key="destination" ref="472611652"/> + </object> + <int key="connectionID">719</int> + </object> + <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> <string key="label">enabled: canAdd</string> <reference key="source" ref="480495865"/> @@ -2036,6 +2009,22 @@ <int key="connectionID">281</int> </object> <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">formatter</string> + <reference key="source" ref="138783933"/> + <reference key="destination" ref="472611652"/> + </object> + <int key="connectionID">733</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">formatter</string> + <reference key="source" ref="1010542831"/> + <reference key="destination" ref="472611652"/> + </object> + <int key="connectionID">734</int> + </object> + <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> <string key="label">enabled: canAdd</string> <reference key="source" ref="762974559"/> @@ -2213,6 +2202,22 @@ <int key="connectionID">645</int> </object> <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">formatter</string> + <reference key="source" ref="812884518"/> + <reference key="destination" ref="472611652"/> + </object> + <int key="connectionID">728</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">formatter</string> + <reference key="source" ref="973656885"/> + <reference key="destination" ref="472611652"/> + </object> + <int key="connectionID">727</int> + </object> + <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> <string key="label">enabled: canAdd</string> <reference key="source" ref="329712707"/> @@ -2375,6 +2380,22 @@ </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> + <string key="label">formatter</string> + <reference key="source" ref="558414852"/> + <reference key="destination" ref="472611652"/> + </object> + <int key="connectionID">730</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">formatter</string> + <reference key="source" ref="543003888"/> + <reference key="destination" ref="472611652"/> + </object> + <int key="connectionID">729</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> <string key="label">delegate</string> <reference key="source" ref="755303575"/> <reference key="destination" ref="1001"/> @@ -2431,6 +2452,14 @@ <int key="connectionID">656</int> </object> <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">formatter</string> + <reference key="source" ref="755303575"/> + <reference key="destination" ref="472611652"/> + </object> + <int key="connectionID">724</int> + </object> + <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> <string key="label">value: arrangedObjects.value</string> <reference key="source" ref="173306098"/> @@ -2487,6 +2516,22 @@ <int key="connectionID">647</int> </object> <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">formatter</string> + <reference key="source" ref="649398657"/> + <reference key="destination" ref="472611652"/> + </object> + <int key="connectionID">731</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">formatter</string> + <reference key="source" ref="1018253149"/> + <reference key="destination" ref="472611652"/> + </object> + <int key="connectionID">732</int> + </object> + <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> <string key="label">enabled: canAdd</string> <reference key="source" ref="417977631"/> @@ -2595,6 +2640,14 @@ <int key="connectionID">648</int> </object> <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">formatter</string> + <reference key="source" ref="906988363"/> + <reference key="destination" ref="472611652"/> + </object> + <int key="connectionID">723</int> + </object> + <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> <string key="label">contentArray: selectedNodes</string> <reference key="source" ref="238023931"/> @@ -2729,6 +2782,14 @@ <int key="connectionID">714</int> </object> <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">formatter</string> + <reference key="source" ref="559516931"/> + <reference key="destination" ref="472611652"/> + </object> + <int key="connectionID">726</int> + </object> + <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> <string key="label">content: arrangedObjects</string> <reference key="source" ref="725142441"/> @@ -2788,6 +2849,14 @@ </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> + <string key="label">formatter</string> + <reference key="source" ref="725142441"/> + <reference key="destination" ref="472611652"/> + </object> + <int key="connectionID">725</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> <string key="label">content</string> <reference key="source" ref="717478128"/> <reference key="destination" ref="559516931"/> @@ -2826,15 +2895,12 @@ </object> <int key="connectionID">684</int> </object> - </object> + </array> <object class="IBMutableOrderedSet" key="objectRecords"> - <object class="NSArray" key="orderedObjects"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array key="orderedObjects"> <object class="IBObjectRecord"> <int key="objectID">0</int> - <object class="NSArray" key="object" id="0"> - <bool key="EncodedWithXMLCoder">YES</bool> - </object> + <array key="object" id="0"/> <reference key="children" ref="1000"/> <nil key="parent"/> </object> @@ -2859,25 +2925,23 @@ <object class="IBObjectRecord"> <int key="objectID">185</int> <reference key="object" ref="725040895"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="574444329"/> <reference ref="924106352"/> <reference ref="987989050"/> <reference ref="480495865"/> <reference ref="762974559"/> <reference ref="503141179"/> - </object> + </array> <reference key="parent" ref="0"/> <string key="objectName">Node Properties View</string> </object> <object class="IBObjectRecord"> <int key="objectID">189</int> <reference key="object" ref="574444329"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="610764175"/> - </object> + </array> <reference key="parent" ref="725040895"/> </object> <object class="IBObjectRecord"> @@ -2888,10 +2952,9 @@ <object class="IBObjectRecord"> <int key="objectID">191</int> <reference key="object" ref="924106352"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="943184796"/> - </object> + </array> <reference key="parent" ref="725040895"/> </object> <object class="IBObjectRecord"> @@ -2902,19 +2965,17 @@ <object class="IBObjectRecord"> <int key="objectID">206</int> <reference key="object" ref="480495865"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="135835921"/> - </object> + </array> <reference key="parent" ref="725040895"/> </object> <object class="IBObjectRecord"> <int key="objectID">207</int> <reference key="object" ref="503141179"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="240925324"/> - </object> + </array> <reference key="parent" ref="725040895"/> </object> <object class="IBObjectRecord"> @@ -2930,13 +2991,12 @@ <object class="IBObjectRecord"> <int key="objectID">258</int> <reference key="object" ref="987989050"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="369516133"/> <reference ref="969856497"/> <reference ref="555379611"/> <reference ref="633188190"/> - </object> + </array> <reference key="parent" ref="725040895"/> </object> <object class="IBObjectRecord"> @@ -2952,11 +3012,10 @@ <object class="IBObjectRecord"> <int key="objectID">261</int> <reference key="object" ref="555379611"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="952219629"/> <reference ref="913349665"/> - </object> + </array> <reference key="parent" ref="987989050"/> </object> <object class="IBObjectRecord"> @@ -2967,19 +3026,17 @@ <object class="IBObjectRecord"> <int key="objectID">263</int> <reference key="object" ref="952219629"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="1010542831"/> - </object> + </array> <reference key="parent" ref="555379611"/> </object> <object class="IBObjectRecord"> <int key="objectID">264</int> <reference key="object" ref="913349665"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="138783933"/> - </object> + </array> <reference key="parent" ref="555379611"/> </object> <object class="IBObjectRecord"> @@ -3001,10 +3058,9 @@ <object class="IBObjectRecord"> <int key="objectID">283</int> <reference key="object" ref="762974559"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="87705550"/> - </object> + </array> <reference key="parent" ref="725040895"/> </object> <object class="IBObjectRecord"> @@ -3015,53 +3071,48 @@ <object class="IBObjectRecord"> <int key="objectID">301</int> <reference key="object" ref="1063930747"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="985476901"/> <reference ref="114363066"/> <reference ref="763774819"/> <reference ref="855960268"/> - </object> + </array> <reference key="parent" ref="0"/> <string key="objectName">Graph Properties View</string> </object> <object class="IBObjectRecord"> <int key="objectID">302</int> <reference key="object" ref="855960268"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="934918825"/> - </object> + </array> <reference key="parent" ref="1063930747"/> </object> <object class="IBObjectRecord"> <int key="objectID">303</int> <reference key="object" ref="985476901"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="1007212304"/> - </object> + </array> <reference key="parent" ref="1063930747"/> </object> <object class="IBObjectRecord"> <int key="objectID">304</int> <reference key="object" ref="114363066"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="741880171"/> <reference ref="280174442"/> <reference ref="878278571"/> <reference ref="16681105"/> - </object> + </array> <reference key="parent" ref="1063930747"/> </object> <object class="IBObjectRecord"> <int key="objectID">307</int> <reference key="object" ref="763774819"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="471795027"/> - </object> + </array> <reference key="parent" ref="1063930747"/> </object> <object class="IBObjectRecord"> @@ -3077,11 +3128,10 @@ <object class="IBObjectRecord"> <int key="objectID">318</int> <reference key="object" ref="280174442"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="680754354"/> <reference ref="537051925"/> - </object> + </array> <reference key="parent" ref="114363066"/> </object> <object class="IBObjectRecord"> @@ -3097,19 +3147,17 @@ <object class="IBObjectRecord"> <int key="objectID">321</int> <reference key="object" ref="680754354"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="973656885"/> - </object> + </array> <reference key="parent" ref="280174442"/> </object> <object class="IBObjectRecord"> <int key="objectID">322</int> <reference key="object" ref="537051925"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="812884518"/> - </object> + </array> <reference key="parent" ref="280174442"/> </object> <object class="IBObjectRecord"> @@ -3147,8 +3195,7 @@ <object class="IBObjectRecord"> <int key="objectID">361</int> <reference key="object" ref="924183072"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="329712707"/> <reference ref="393903553"/> <reference ref="106397766"/> @@ -3166,47 +3213,43 @@ <reference ref="586903912"/> <reference ref="559516931"/> <reference ref="725142441"/> - </object> + </array> <reference key="parent" ref="0"/> <string key="objectName">Edge Properties View</string> </object> <object class="IBObjectRecord"> <int key="objectID">362</int> <reference key="object" ref="329712707"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="218825565"/> - </object> + </array> <reference key="parent" ref="924183072"/> </object> <object class="IBObjectRecord"> <int key="objectID">363</int> <reference key="object" ref="393903553"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="318912502"/> <reference ref="401297526"/> <reference ref="384092475"/> <reference ref="879414039"/> - </object> + </array> <reference key="parent" ref="924183072"/> </object> <object class="IBObjectRecord"> <int key="objectID">364</int> <reference key="object" ref="106397766"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="140438221"/> - </object> + </array> <reference key="parent" ref="924183072"/> </object> <object class="IBObjectRecord"> <int key="objectID">365</int> <reference key="object" ref="299136596"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="719117552"/> - </object> + </array> <reference key="parent" ref="924183072"/> </object> <object class="IBObjectRecord"> @@ -3232,11 +3275,10 @@ <object class="IBObjectRecord"> <int key="objectID">370</int> <reference key="object" ref="384092475"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="477855207"/> <reference ref="970801822"/> - </object> + </array> <reference key="parent" ref="393903553"/> </object> <object class="IBObjectRecord"> @@ -3247,19 +3289,17 @@ <object class="IBObjectRecord"> <int key="objectID">372</int> <reference key="object" ref="477855207"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="543003888"/> - </object> + </array> <reference key="parent" ref="384092475"/> </object> <object class="IBObjectRecord"> <int key="objectID">373</int> <reference key="object" ref="970801822"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="558414852"/> - </object> + </array> <reference key="parent" ref="384092475"/> </object> <object class="IBObjectRecord"> @@ -3280,13 +3320,12 @@ <object class="IBObjectRecord"> <int key="objectID">408</int> <reference key="object" ref="385790439"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="276248098"/> <reference ref="755303575"/> <reference ref="1039219660"/> <reference ref="695772668"/> - </object> + </array> <reference key="parent" ref="924183072"/> </object> <object class="IBObjectRecord"> @@ -3297,11 +3336,10 @@ <object class="IBObjectRecord"> <int key="objectID">410</int> <reference key="object" ref="755303575"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="173306098"/> <reference ref="314771163"/> - </object> + </array> <reference key="parent" ref="385790439"/> </object> <object class="IBObjectRecord"> @@ -3317,19 +3355,17 @@ <object class="IBObjectRecord"> <int key="objectID">413</int> <reference key="object" ref="173306098"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="1018253149"/> - </object> + </array> <reference key="parent" ref="755303575"/> </object> <object class="IBObjectRecord"> <int key="objectID">414</int> <reference key="object" ref="314771163"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="649398657"/> - </object> + </array> <reference key="parent" ref="755303575"/> </object> <object class="IBObjectRecord"> @@ -3345,28 +3381,25 @@ <object class="IBObjectRecord"> <int key="objectID">422</int> <reference key="object" ref="417977631"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="888126559"/> - </object> + </array> <reference key="parent" ref="924183072"/> </object> <object class="IBObjectRecord"> <int key="objectID">423</int> <reference key="object" ref="324179323"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="1007421740"/> - </object> + </array> <reference key="parent" ref="924183072"/> </object> <object class="IBObjectRecord"> <int key="objectID">424</int> <reference key="object" ref="494601848"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="527874463"/> - </object> + </array> <reference key="parent" ref="924183072"/> </object> <object class="IBObjectRecord"> @@ -3387,10 +3420,9 @@ <object class="IBObjectRecord"> <int key="objectID">434</int> <reference key="object" ref="841146514"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="1043816572"/> - </object> + </array> <reference key="parent" ref="924183072"/> </object> <object class="IBObjectRecord"> @@ -3401,19 +3433,17 @@ <object class="IBObjectRecord"> <int key="objectID">436</int> <reference key="object" ref="381359914"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="847027582"/> - </object> + </array> <reference key="parent" ref="924183072"/> </object> <object class="IBObjectRecord"> <int key="objectID">437</int> <reference key="object" ref="906988363"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="239596808"/> - </object> + </array> <reference key="parent" ref="924183072"/> </object> <object class="IBObjectRecord"> @@ -3440,19 +3470,17 @@ <object class="IBObjectRecord"> <int key="objectID">461</int> <reference key="object" ref="507124675"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="299507146"/> - </object> + </array> <reference key="parent" ref="0"/> </object> <object class="IBObjectRecord"> <int key="objectID">462</int> <reference key="object" ref="299507146"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="767543822"/> - </object> + </array> <reference key="parent" ref="507124675"/> </object> <object class="IBObjectRecord"> @@ -3475,19 +3503,17 @@ <object class="IBObjectRecord"> <int key="objectID">657</int> <reference key="object" ref="513522177"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="522971083"/> - </object> + </array> <reference key="parent" ref="0"/> </object> <object class="IBObjectRecord"> <int key="objectID">658</int> <reference key="object" ref="664436771"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="579604223"/> - </object> + </array> <reference key="parent" ref="0"/> </object> <object class="IBObjectRecord"> @@ -3503,10 +3529,9 @@ <object class="IBObjectRecord"> <int key="objectID">664</int> <reference key="object" ref="786681620"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="78896067"/> - </object> + </array> <reference key="parent" ref="924183072"/> </object> <object class="IBObjectRecord"> @@ -3517,10 +3542,9 @@ <object class="IBObjectRecord"> <int key="objectID">666</int> <reference key="object" ref="559516931"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="714570294"/> - </object> + </array> <reference key="parent" ref="924183072"/> </object> <object class="IBObjectRecord"> @@ -3531,10 +3555,9 @@ <object class="IBObjectRecord"> <int key="objectID">668</int> <reference key="object" ref="725142441"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="829332788"/> - </object> + </array> <reference key="parent" ref="924183072"/> </object> <object class="IBObjectRecord"> @@ -3545,10 +3568,9 @@ <object class="IBObjectRecord"> <int key="objectID">670</int> <reference key="object" ref="1062338922"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="825166761"/> - </object> + </array> <reference key="parent" ref="924183072"/> </object> <object class="IBObjectRecord"> @@ -3559,10 +3581,9 @@ <object class="IBObjectRecord"> <int key="objectID">672</int> <reference key="object" ref="586903912"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="children"> <reference ref="187890294"/> - </object> + </array> <reference key="parent" ref="924183072"/> </object> <object class="IBObjectRecord"> @@ -3582,286 +3603,153 @@ <reference key="parent" ref="0"/> <string key="objectName">Target Anchor Names Array Controller</string> </object> - </object> - </object> - <object class="NSMutableDictionary" key="flattenedProperties"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>-1.IBPluginDependency</string> - <string>-2.IBPluginDependency</string> - <string>-3.IBPluginDependency</string> - <string>185.IBPluginDependency</string> - <string>189.IBPluginDependency</string> - <string>190.IBPluginDependency</string> - <string>191.IBPluginDependency</string> - <string>192.IBPluginDependency</string> - <string>206.IBPluginDependency</string> - <string>207.IBPluginDependency</string> - <string>208.IBPluginDependency</string> - <string>209.IBPluginDependency</string> - <string>258.IBPluginDependency</string> - <string>259.IBPluginDependency</string> - <string>260.IBPluginDependency</string> - <string>261.IBPluginDependency</string> - <string>262.IBPluginDependency</string> - <string>263.IBPluginDependency</string> - <string>264.IBPluginDependency</string> - <string>265.IBPluginDependency</string> - <string>266.IBPluginDependency</string> - <string>272.IBPluginDependency</string> - <string>283.IBPluginDependency</string> - <string>284.IBPluginDependency</string> - <string>301.IBPluginDependency</string> - <string>302.IBPluginDependency</string> - <string>303.IBPluginDependency</string> - <string>304.IBPluginDependency</string> - <string>307.IBPluginDependency</string> - <string>314.IBPluginDependency</string> - <string>317.IBPluginDependency</string> - <string>318.IBPluginDependency</string> - <string>319.IBPluginDependency</string> - <string>320.IBPluginDependency</string> - <string>321.IBPluginDependency</string> - <string>322.IBPluginDependency</string> - <string>323.IBPluginDependency</string> - <string>324.IBPluginDependency</string> - <string>325.IBPluginDependency</string> - <string>326.IBPluginDependency</string> - <string>343.IBPluginDependency</string> - <string>360.IBPluginDependency</string> - <string>361.IBPluginDependency</string> - <string>362.IBPluginDependency</string> - <string>363.IBPluginDependency</string> - <string>364.IBPluginDependency</string> - <string>365.IBPluginDependency</string> - <string>366.IBPluginDependency</string> - <string>367.IBPluginDependency</string> - <string>368.IBPluginDependency</string> - <string>369.IBPluginDependency</string> - <string>370.IBPluginDependency</string> - <string>371.IBPluginDependency</string> - <string>372.IBPluginDependency</string> - <string>373.IBPluginDependency</string> - <string>374.IBPluginDependency</string> - <string>375.IBPluginDependency</string> - <string>376.IBPluginDependency</string> - <string>408.IBPluginDependency</string> - <string>409.IBPluginDependency</string> - <string>410.IBPluginDependency</string> - <string>411.IBPluginDependency</string> - <string>412.IBPluginDependency</string> - <string>413.IBPluginDependency</string> - <string>414.IBPluginDependency</string> - <string>415.IBPluginDependency</string> - <string>416.IBPluginDependency</string> - <string>422.IBPluginDependency</string> - <string>423.IBPluginDependency</string> - <string>424.IBPluginDependency</string> - <string>425.IBPluginDependency</string> - <string>426.IBPluginDependency</string> - <string>427.IBPluginDependency</string> - <string>434.IBPluginDependency</string> - <string>435.IBPluginDependency</string> - <string>436.IBPluginDependency</string> - <string>437.IBPluginDependency</string> - <string>438.IBPluginDependency</string> - <string>439.IBPluginDependency</string> - <string>441.IBPluginDependency</string> - <string>442.IBPluginDependency</string> - <string>461.IBNSWindowAutoPositionCentersHorizontal</string> - <string>461.IBNSWindowAutoPositionCentersVertical</string> - <string>461.IBPluginDependency</string> - <string>461.IBWindowTemplateEditedContentRect</string> - <string>461.NSWindowTemplate.visibleAtLaunch</string> - <string>462.IBPluginDependency</string> - <string>463.IBPluginDependency</string> - <string>575.IBPluginDependency</string> - <string>585.IBPluginDependency</string> - <string>657.IBPluginDependency</string> - <string>658.IBPluginDependency</string> - <string>659.IBPluginDependency</string> - <string>660.IBPluginDependency</string> - <string>664.IBPluginDependency</string> - <string>665.IBPluginDependency</string> - <string>666.IBPluginDependency</string> - <string>667.IBPluginDependency</string> - <string>668.IBPluginDependency</string> - <string>669.IBPluginDependency</string> - <string>670.IBPluginDependency</string> - <string>671.IBPluginDependency</string> - <string>672.IBPluginDependency</string> - <string>673.IBPluginDependency</string> - <string>674.IBPluginDependency</string> - <string>681.IBPluginDependency</string> - </object> - <object class="NSArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <boolean value="NO"/> - <boolean value="NO"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{624, 540}, {193, 256}}</string> - <boolean value="YES"/> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - </object> - </object> - <object class="NSMutableDictionary" key="unlocalizedProperties"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference key="dict.sortedKeys" ref="0"/> - <reference key="dict.values" ref="0"/> + <object class="IBObjectRecord"> + <int key="objectID">718</int> + <reference key="object" ref="472611652"/> + <reference key="parent" ref="0"/> + </object> + </array> </object> + <dictionary class="NSMutableDictionary" key="flattenedProperties"> + <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="185.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="189.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="190.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="191.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="192.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="206.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="207.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="208.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="209.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="258.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="259.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="260.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="261.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="262.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="263.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="264.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="265.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="266.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="272.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="283.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="284.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="301.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="302.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="303.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="304.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="307.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="314.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="317.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="318.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="319.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="320.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="321.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="322.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="323.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="324.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="325.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="326.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="343.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="360.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="361.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="362.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="363.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="364.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="365.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="366.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="367.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="368.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="369.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="370.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="371.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="372.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="373.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="374.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="375.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="376.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="408.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="409.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="410.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="411.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="412.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="413.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="414.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="415.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="416.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="422.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="423.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="424.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="425.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="426.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="427.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="434.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="435.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="436.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="437.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="438.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="439.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="441.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="442.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <boolean value="NO" key="461.IBNSWindowAutoPositionCentersHorizontal"/> + <boolean value="NO" key="461.IBNSWindowAutoPositionCentersVertical"/> + <string key="461.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="461.IBWindowTemplateEditedContentRect">{{624, 540}, {193, 256}}</string> + <boolean value="YES" key="461.NSWindowTemplate.visibleAtLaunch"/> + <string key="462.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="463.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="575.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="585.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="657.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="658.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="659.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="660.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="664.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="665.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="666.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="667.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="668.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="669.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="670.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="671.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="672.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="673.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="674.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="681.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + <string key="718.CustomClassName">TikzFormatter</string> + <string key="718.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> + </dictionary> + <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/> <nil key="activeLocalization"/> - <object class="NSMutableDictionary" key="localizations"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference key="dict.sortedKeys" ref="0"/> - <reference key="dict.values" ref="0"/> - </object> + <dictionary class="NSMutableDictionary" key="localizations"/> <nil key="sourceID"/> - <int key="maxID">717</int> + <int key="maxID">734</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> - <object class="NSMutableArray" key="referencedPartialClassDescriptions"> - <bool key="EncodedWithXMLCoder">YES</bool> + <array class="NSMutableArray" key="referencedPartialClassDescriptions"> <object class="IBPartialClassDescription"> <string key="className">FirstResponder</string> - <object class="NSMutableDictionary" key="actions"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>applyStyleToSelectedNodes:</string> - <string>clearStyleOfSelectedNodes:</string> - </object> - <object class="NSArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>id</string> - <string>id</string> - </object> - </object> - <object class="NSMutableDictionary" key="actionInfosByName"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>applyStyleToSelectedNodes:</string> - <string>clearStyleOfSelectedNodes:</string> - </object> - <object class="NSArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="IBActionInfo"> - <string key="name">applyStyleToSelectedNodes:</string> - <string key="candidateClassName">id</string> - </object> - <object class="IBActionInfo"> - <string key="name">clearStyleOfSelectedNodes:</string> - <string key="candidateClassName">id</string> - </object> - </object> - </object> + <dictionary class="NSMutableDictionary" key="actions"> + <string key="applyStyleToSelectedNodes:">id</string> + <string key="clearStyleOfSelectedNodes:">id</string> + </dictionary> + <dictionary class="NSMutableDictionary" key="actionInfosByName"> + <object class="IBActionInfo" key="applyStyleToSelectedNodes:"> + <string key="name">applyStyleToSelectedNodes:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo" key="clearStyleOfSelectedNodes:"> + <string key="name">clearStyleOfSelectedNodes:</string> + <string key="candidateClassName">id</string> + </object> + </dictionary> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBUserSource</string> <string key="minorKey"/> </object> </object> - </object> + </array> </object> <int key="IBDocument.localizationMode">0</int> <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string> @@ -3871,24 +3759,21 @@ </object> <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3</string> - <integer value="3000" key="NS.object.0"/> + <real value="4100" key="NS.object.0"/> </object> <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> <int key="IBDocument.defaultPropertyAccessControl">3</int> - <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSAddTemplate</string> - <string>NSRemoveTemplate</string> - <string>NSSwitch</string> - </object> - <object class="NSArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>{8, 8}</string> - <string>{8, 8}</string> - <string>{15, 15}</string> - </object> - </object> + <dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes"> + <string key="NSAddTemplate">{8, 8}</string> + <string key="NSRemoveTemplate">{8, 8}</string> + <string key="NSSwitch">{15, 15}</string> + </dictionary> </data> + <classes> + <class name="IBCustomFormatter"> + <fallbacks> + <name>NSFormatter</name> + </fallbacks> + </class> + </classes> </archive> diff --git a/tikzit/TikZiT.xcodeproj/project.pbxproj b/tikzit/TikZiT.xcodeproj/project.pbxproj index b8ea5c6..9f165a0 100644 --- a/tikzit/TikZiT.xcodeproj/project.pbxproj +++ b/tikzit/TikZiT.xcodeproj/project.pbxproj @@ -129,6 +129,7 @@ 7F6E2C8916B0091300BFE20D /* maths.m in Sources */ = {isa = PBXBuildFile; fileRef = 7F6E2C8716B0091300BFE20D /* maths.m */; }; 7F6E2C8A16B0096000BFE20D /* SupportDir.m in Sources */ = {isa = PBXBuildFile; fileRef = 55652DF813E1F2030023F4C6 /* SupportDir.m */; }; 7F6E2C8C16B00ABA00BFE20D /* SFBInspectors.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 55CA98D412EF8FCE008F0368 /* SFBInspectors.framework */; }; + 7FB9BFEE16B57C2E00773146 /* TikzFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FB9BFED16B57C2E00773146 /* TikzFormatter.m */; }; 7FEED45716B1A7C500B056CB /* StyleManager.m in Sources */ = {isa = PBXBuildFile; fileRef = 7FEED45616B1A7C500B056CB /* StyleManager.m */; }; 8D15AC2C0486D014006FF6A4 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 2A37F4B9FDCFA73011CA2CEA /* Credits.rtf */; }; 8D15AC2F0486D014006FF6A4 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165FFE840EACC02AAC07 /* InfoPlist.strings */; }; @@ -339,6 +340,8 @@ 55F9E04411FF54F000F5659E /* NSString+LatexConstants.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSString+LatexConstants.m"; path = "src/common/NSString+LatexConstants.m"; sourceTree = "<group>"; }; 55FF4E64116A401B000C22B4 /* libicucore.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libicucore.dylib; path = usr/lib/libicucore.dylib; sourceTree = SDKROOT; }; 7F6E2C8716B0091300BFE20D /* maths.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = maths.m; path = src/common/test/maths.m; sourceTree = "<group>"; }; + 7FB9BFEC16B57C2E00773146 /* TikzFormatter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = TikzFormatter.h; path = src/osx/TikzFormatter.h; sourceTree = "<group>"; }; + 7FB9BFED16B57C2E00773146 /* TikzFormatter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = TikzFormatter.m; path = src/osx/TikzFormatter.m; sourceTree = "<group>"; }; 7FEED45516B1A7C400B056CB /* StyleManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = StyleManager.h; path = src/common/StyleManager.h; sourceTree = "<group>"; }; 7FEED45616B1A7C500B056CB /* StyleManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = StyleManager.m; path = src/common/StyleManager.m; sourceTree = "<group>"; }; 8D15AC360486D014006FF6A4 /* TikZiT-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "TikZiT-Info.plist"; sourceTree = "<group>"; }; @@ -618,6 +621,7 @@ 55D9467311659F5E0044178C /* Gui */ = { isa = PBXGroup; children = ( + 7FB9BFE616B54BE300773146 /* Formatter */, 55D9468011659FD50044178C /* GraphicsView */, 5573B90C11DA22E500B5DC5D /* Preamble */, 5573B8BF11D9FD1800B5DC5D /* Preview */, @@ -676,6 +680,15 @@ name = StylePalette; sourceTree = "<group>"; }; + 7FB9BFE616B54BE300773146 /* Formatter */ = { + isa = PBXGroup; + children = ( + 7FB9BFEC16B57C2E00773146 /* TikzFormatter.h */, + 7FB9BFED16B57C2E00773146 /* TikzFormatter.m */, + ); + name = Formatter; + sourceTree = "<group>"; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -881,6 +894,7 @@ 553A4C5A144ED3D500AA6FAC /* NilToEmptyStringTransformer.m in Sources */, 55598E351635372E0023450A /* DiamondShape.m in Sources */, 7FEED45716B1A7C500B056CB /* StyleManager.m in Sources */, + 7FB9BFEE16B57C2E00773146 /* TikzFormatter.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/tikzit/src/common/TikzGraphAssembler.h b/tikzit/src/common/TikzGraphAssembler.h index adaf443..a0c8a0d 100644 --- a/tikzit/src/common/TikzGraphAssembler.h +++ b/tikzit/src/common/TikzGraphAssembler.h @@ -41,6 +41,8 @@ - (BOOL)parseTikz:(NSString*)tikz; - (BOOL)parseTikz:(NSString*)tikz forGraph:(Graph*)gr; +- (BOOL)testTikz:(NSString*)tikz; + - (void)prepareNode; - (void)finishNode; diff --git a/tikzit/src/common/TikzGraphAssembler.m b/tikzit/src/common/TikzGraphAssembler.m index 7d8d0e7..050b5fe 100644 --- a/tikzit/src/common/TikzGraphAssembler.m +++ b/tikzit/src/common/TikzGraphAssembler.m @@ -34,8 +34,16 @@ extern int yylex_destroy(void); static NSLock *parseLock = nil; static id currentAssembler = nil; +int yylineno; +int yyleng; +int lineno; +int tokenpos; +char *yystr; +char linebuff[500]; + + void yyerror(const char *str) { - NSLog(@"Parse error: %s", str); + NSLog(@"Parse error on line %i: %s\n%s\n%@\n", lineno, str, linebuff, [[@"" stringByPaddingToLength:(tokenpos-yyleng) withString: @" " startingAtIndex:0] stringByAppendingString:[@"" stringByPaddingToLength:yyleng withString: @"^" startingAtIndex:0]]); if (currentAssembler != nil) { NSError *error = [NSError errorWithDomain:@"net.sourceforge.tikzit" code:TZ_ERR_PARSE @@ -81,6 +89,10 @@ int yywrap() { - (BOOL)parseTikz:(NSString*)tikz forGraph:(Graph*)gr { [parseLock lock]; + + lineno = 1; + tokenpos = 0; + linebuff[0] = 0; NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; currentAssembler = self; @@ -93,12 +105,14 @@ int yywrap() { // the node map keeps track of the mapping of names to nodes nodeMap = [[NSMutableDictionary alloc] init]; - - // do the parsing - yy_scan_string([tikz UTF8String]); - yyparse(); - yylex_destroy(); - + + // do the parsing if actual input + if([tikz length] > 0){ + yy_scan_string([tikz UTF8String]); + yyparse(); + yylex_destroy(); + } + [nodeMap release]; nodeMap = nil; @@ -110,6 +124,22 @@ int yywrap() { return (graph != nil); } +- (BOOL)testTikz:(NSString *)tikz{ + BOOL r; + + NSString * testTikz = [NSString stringWithFormat: @"{%@}", tikz]; + + yy_scan_string([testTikz UTF8String]); + yylex(); + + r = !(yyleng < [testTikz length]); + + [testTikz autorelease]; + yylex_destroy(); + + return r; +} + - (void)prepareNode { currentNode = [[Node alloc] init]; } diff --git a/tikzit/src/common/tikzlexer.lm b/tikzit/src/common/tikzlexer.lm index 9af0c8d..8f34ace 100644 --- a/tikzit/src/common/tikzlexer.lm +++ b/tikzit/src/common/tikzlexer.lm @@ -1,4 +1,6 @@ %option nounput +%option yylineno + %{ // // tikzparser.l @@ -30,48 +32,62 @@ #include "tikzparser.h" #endif +extern char linebuff[500]; +extern int lineno; +extern yy_size_t yyleng; +extern int tokenpos; %} %% -\n /* ignore end of line */; -[ \t]+ /* ignore whitespace */; -\\begin return LATEXBEGIN; -\\end return LATEXEND; -\{tikzpicture\} return TIKZPICTURE; -\{pgfonlayer\} return PGFONLAYER; -\( return LEFTPARENTHESIS; -\) return RIGHTPARENTHESIS; -\[ return LEFTBRACKET; -\] return RIGHTBRACKET; -; return SEMICOLON; -, return COMMA; -\. return FULLSTOP; -= return EQUALS; -\\draw return DRAW; -to return TO; -\\node return NODE; -\\path return PATH; -node return ALTNODE; -rectangle return RECTANGLE; -at return AT; +%\n /* ignore end of line */; +\n.* { strcpy(linebuff, yytext+1); + lineno++; + tokenpos = 0; + yyless(1); + } +[ ]+ { tokenpos += yyleng; } /* ignore whitespace */; +[\t]+ { tokenpos += 4*yyleng; } /* ignore whitespace */; +\\begin { tokenpos += yyleng; return LATEXBEGIN; } +\\end { tokenpos += yyleng; return LATEXEND; } +\{tikzpicture\} { tokenpos += yyleng; return TIKZPICTURE; } +\{pgfonlayer\} { tokenpos += yyleng; return PGFONLAYER; } +\( { tokenpos += yyleng; return LEFTPARENTHESIS; } +\) { tokenpos += yyleng; return RIGHTPARENTHESIS; } +\[ { tokenpos += yyleng; return LEFTBRACKET; } +\] { tokenpos += yyleng; return RIGHTBRACKET; } +; { tokenpos += yyleng; return SEMICOLON; } +, { tokenpos += yyleng; return COMMA; } +\. { tokenpos += yyleng; return FULLSTOP; } += { tokenpos += yyleng; return EQUALS; } +\\draw { tokenpos += yyleng; return DRAW; } +to { tokenpos += yyleng; return TO; } +\\node { tokenpos += yyleng; return NODE; } +\\path { tokenpos += yyleng; return PATH; } +node { tokenpos += yyleng; return ALTNODE; } +rectangle { tokenpos += yyleng; return RECTANGLE; } +at { tokenpos += yyleng; return AT; } [0-9]+ { + tokenpos += yyleng; yylval.nsstr=[NSString stringWithUTF8String:yytext]; return NATURALNUMBER; } (\-?[0-9]*\.[0-9]+)|(\-?[0-9]+) { + tokenpos += yyleng; yylval.nsstr=[NSString stringWithUTF8String:yytext]; return REALNUMBER; } \\?[a-zA-Z<>\-\'][a-zA-Z<>\-\'0-9]* { //' + tokenpos += yyleng; yylval.nsstr=[NSString stringWithUTF8String:yytext]; return LWORD; } \"[^\"]*\" /* " */ { + tokenpos += yyleng; yylval.nsstr=[NSString stringWithUTF8String:yytext]; return QUOTEDSTRING; } @@ -93,8 +109,10 @@ at return AT; } NSString *s = [buf copy]; + yyleng += 1 + [buf length]; [s autorelease]; yylval.nsstr = s; + tokenpos += yyleng; return DELIMITEDSTRING; } diff --git a/tikzit/src/common/tikzparser.ym b/tikzit/src/common/tikzparser.ym index 532b6c8..487cfd4 100644 --- a/tikzit/src/common/tikzparser.ym +++ b/tikzit/src/common/tikzparser.ym @@ -29,6 +29,9 @@ #import "TikzGraphAssembler.h" #import "GraphElementProperty.h" +extern char* yystr; +extern int yylineno; +extern int tokenpos; extern int yylex(void); extern void yyerror(const char *str); |